https://www.mediawiki.org/wiki/Special:Code/MediaWiki/111899
Revision: 111899
Author: dantman
Date: 2012-02-20 00:03:24 +0000 (Mon, 20 Feb 2012)
Log Message:
-----------
Followup r111898; Do the same for the attribute whitelist.
Modified Paths:
--------------
trunk/phase3/includes/Sanitizer.php
Modified: trunk/phase3/includes/Sanitizer.php
===================================================================
--- trunk/phase3/includes/Sanitizer.php 2012-02-19 23:40:48 UTC (rev 111898)
+++ trunk/phase3/includes/Sanitizer.php 2012-02-20 00:03:24 UTC (rev 111899)
@@ -1478,10 +1478,7 @@
* @return Array
*/
static function attributeWhitelist( $element ) {
- static $list;
- if( !isset( $list ) ) {
- $list = Sanitizer::setupAttributeWhitelist();
- }
+ $list = Sanitizer::setupAttributeWhitelist();
return isset( $list[$element] )
? $list[$element]
: array();
@@ -1495,6 +1492,13 @@
static function setupAttributeWhitelist() {
global $wgAllowRdfaAttributes, $wgHtml5,
$wgAllowMicrodataAttributes;
+ static $whitelist, $staticInitialised;
+ $globalContext = implode( '-', compact(
'wgAllowRdfaAttributes', 'wgHtml5', 'wgAllowMicrodataAttributes' ) );
+
+ if ( isset( $whitelist ) && $staticInitialised ==
$globalContext ) {
+ return $whitelist;
+ }
+
$common = array( 'id', 'class', 'lang', 'dir', 'title', 'style'
);
if ( $wgAllowRdfaAttributes ) {
@@ -1673,6 +1677,8 @@
);
}
+ $staticInitialised = $globalContext;
+
return $whitelist;
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
