| Index: trunk/phase3/includes/OutputPage.php |
| — | — | @@ -232,15 +232,6 @@ |
| 233 | 233 | private $mRedirectedFrom = null; |
| 234 | 234 | |
| 235 | 235 | /** |
| 236 | | - * Name prefixes that can be used in addMeta |
| 237 | | - */ |
| 238 | | - public static $metaAttrPrefixes = array( |
| 239 | | - 'http' => 'http-equiv', |
| 240 | | - 'itemprop' => 'itemprop', |
| 241 | | - 'property' => 'property', |
| 242 | | - ); |
| 243 | | - |
| 244 | | - /** |
| 245 | 236 | * Constructor for OutputPage. This should not be called directly. |
| 246 | 237 | * Instead a new RequestContext should be created and it will implicitly create |
| 247 | 238 | * a OutputPage tied to that context. |
| — | — | @@ -287,13 +278,7 @@ |
| 288 | 279 | /** |
| 289 | 280 | * Add a new <meta> tag |
| 290 | 281 | * To add an http-equiv meta tag, precede the name with "http:" |
| 291 | | - * To add a Microdata itemprop meta tag, precede the name with "itemprop:" |
| 292 | | - * To add a RDFa property meta tag, precede the name with "property:" |
| 293 | 282 | * |
| 294 | | - * itemprop: and property: were introduced in 1.20, you can feature |
| 295 | | - * test for them by checking for the key in the new |
| 296 | | - * OutputPage::$metaAttrPrefixes variable. |
| 297 | | - * |
| 298 | 283 | * @param $name String tag name |
| 299 | 284 | * @param $val String tag value |
| 300 | 285 | */ |
| — | — | @@ -3010,16 +2995,11 @@ |
| 3011 | 2996 | } |
| 3012 | 2997 | |
| 3013 | 2998 | foreach ( $this->mMetatags as $tag ) { |
| 3014 | | - $a = 'name'; // default attribute |
| 3015 | | - foreach ( self::$metaAttrPrefixes as $prefix => $attribute ) { |
| 3016 | | - // Check if the name starts with the prefix |
| 3017 | | - if ( strpos( $tag[0], "$prefix:" ) === 0 ) { |
| 3018 | | - // Set the attribute name we're using |
| 3019 | | - $a = $attribute; |
| 3020 | | - // Strip the prefix from the name |
| 3021 | | - $tag[0] = substr( $tag[0], strlen( $prefix ) + 1 ); |
| 3022 | | - break; |
| 3023 | | - } |
| | 2999 | + if ( 0 == strcasecmp( 'http:', substr( $tag[0], 0, 5 ) ) ) { |
| | 3000 | + $a = 'http-equiv'; |
| | 3001 | + $tag[0] = substr( $tag[0], 5 ); |
| | 3002 | + } else { |
| | 3003 | + $a = 'name'; |
| 3024 | 3004 | } |
| 3025 | 3005 | $tags[] = Html::element( 'meta', |
| 3026 | 3006 | array( |