mirror of
https://github.com/ezyang/htmlpurifier.git
synced 2025-07-09 16:56:20 +02:00
[3.1.0] Further cleanup, making standalone work again
- Remove includes call in HTMLPurifier.auto.php - Relax ConfigSchema treatment in generate-includes.php - Clean up some empty comments (there are probably more) - De-indent some extends - class_exists() should now attempt to use autoload - schema.ser is now a standalone file - tests/index.php can be run from any directory git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1540 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
@ -146,14 +146,14 @@ class HTMLPurifier_HTMLModuleManager
|
||||
$ok = false;
|
||||
foreach ($this->prefixes as $prefix) {
|
||||
$module = $prefix . $original_module;
|
||||
if ($this->_classExists($module)) {
|
||||
if (class_exists($module)) {
|
||||
$ok = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!$ok) {
|
||||
$module = $original_module;
|
||||
if (!$this->_classExists($module)) {
|
||||
if (!class_exists($module)) {
|
||||
trigger_error($original_module . ' module does not exist',
|
||||
E_USER_ERROR);
|
||||
return;
|
||||
@ -168,15 +168,6 @@ class HTMLPurifier_HTMLModuleManager
|
||||
$this->registeredModules[$module->name] = $module;
|
||||
}
|
||||
|
||||
/**
|
||||
* Safely tests for class existence without invoking __autoload in PHP5
|
||||
* or greater.
|
||||
* @param $name String class name to test
|
||||
*/
|
||||
private function _classExists($name) {
|
||||
return class_exists($name, false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds a module to the current doctype by first registering it,
|
||||
* and then tacking it on to the active doctype
|
||||
|
Reference in New Issue
Block a user