diff options
author | Zach Copley <zach@status.net> | 2010-02-24 16:52:16 -0800 |
---|---|---|
committer | Zach Copley <zach@status.net> | 2010-02-24 16:52:16 -0800 |
commit | 10884dcd49da8db1fcca3cbbef0f85869d43520e (patch) | |
tree | 7c8376ed6cea7c971faacaa6e223a670d0e6481f /extlib/HTMLPurifier/HTMLPurifier.autoload.php | |
parent | 543ff40ef62f2587cde084b03bcf2e956f52ce2f (diff) | |
parent | 5173d92895e892412e8a8c10b4e434c924593c99 (diff) |
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline:
Merge StatusNet core localization updates from 0.9.x branch
Fix update_po_templates.php to support the plural and context variants of _m() in plugins
Drop HTMLPurifier; we don't need its extra capabilities and we're already using htmLawed which is lighter-weight.
OStatus: handle update-profile Salmon pings
Revert "Updated jQuery Form Plugin from v2.17 to v2.36"
OStatus: disable HTMLPurify cache unless we've configured a writable path for it.
Diffstat (limited to 'extlib/HTMLPurifier/HTMLPurifier.autoload.php')
-rw-r--r-- | extlib/HTMLPurifier/HTMLPurifier.autoload.php | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/extlib/HTMLPurifier/HTMLPurifier.autoload.php b/extlib/HTMLPurifier/HTMLPurifier.autoload.php deleted file mode 100644 index 8d4017640..000000000 --- a/extlib/HTMLPurifier/HTMLPurifier.autoload.php +++ /dev/null @@ -1,21 +0,0 @@ -<?php - -/** - * @file - * Convenience file that registers autoload handler for HTML Purifier. - */ - -if (function_exists('spl_autoload_register') && function_exists('spl_autoload_unregister')) { - // We need unregister for our pre-registering functionality - HTMLPurifier_Bootstrap::registerAutoload(); - if (function_exists('__autoload')) { - // Be polite and ensure that userland autoload gets retained - spl_autoload_register('__autoload'); - } -} elseif (!function_exists('__autoload')) { - function __autoload($class) { - return HTMLPurifier_Bootstrap::autoload($class); - } -} - -// vim: et sw=4 sts=4 |