Merge in r649-656, prompted by changing two of Encoder's functions to static.

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/branches/strict@657 48356398-32a2-884e-a903-53898d9a118a
2025-07-14 02:56:34 +02:00 · 2007-01-19 02:28:53 +00:00
parent 5395d8b4bd
commit 37ea1673dd
30 changed files with 173 additions and 29 deletions
--- a/library/HTMLPurifier/EntityLookup.php
+++ b/library/HTMLPurifier/EntityLookup.php
@ -26,6 +26,7 @@ class HTMLPurifier_EntityLookup {
    
    /**
     * Retrieves sole instance of the object.
+     * @static
     * @param Optional prototype of custom lookup table to overload with.
     */
    static function instance($prototype = false) {