* Only build the HTML attribute whitelist tree once.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index bbbb56a..b9d3449 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -227,6 +227,8 @@ Various bugfixes, small features, and a few experimental things:
 * Remove linkscc table code, no longer used.
 * (bug 2271) Use faster text-only link replacement in image alt text
   instead of rerunning expensive link lookup and HTML generation.
+* Only build the HTML attribute whitelist tree once.
+
 
 === Caveats ===
 

diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index 116a803..449ca5c 100644 (file)
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -663,7 +663,10 @@ class Sanitizer {
         * @return array
         */
        function attributeWhitelist( $element ) {
-               $list = Sanitizer::setupAttributeWhitelist();
+               static $list;
+               if( !isset( $list ) ) {
+                       $list = Sanitizer::setupAttributeWhitelist();
+               }
                return isset( $list[$element] )
                        ? $list[$element]
                        : array();