| Index: trunk/phase3/includes/MimeMagic.php |
| — | — | @@ -457,7 +457,6 @@ |
| 458 | 458 | */ |
| 459 | 459 | $xml = new XmlTypeCheck( $file ); |
| 460 | 460 | if( $xml->wellFormed ) { |
| 461 | | - global $wgAdditionalXMLTypes; |
| 462 | 461 | $types = array( |
| 463 | 462 | 'http://www.w3.org/2000/svg:svg' => 'image/svg+xml', |
| 464 | 463 | 'svg' => 'image/svg+xml', |
| — | — | @@ -465,12 +464,11 @@ |
| 466 | 465 | 'http://www.w3.org/1999/xhtml:html' => 'text/html', // application/xhtml+xml? |
| 467 | 466 | 'html' => 'text/html', // application/xhtml+xml? |
| 468 | 467 | ); |
| 469 | | - |
| 470 | 468 | if( isset( $types[$xml->rootElement] ) ) { |
| 471 | | - return $types[$xml->rootElement]; |
| 472 | | - } elseif( isset( $wgAdditionalXMLTypes[$xml->rootElement] ) ) { |
| 473 | | - return $wgAdditionalXMLTypes[$xml->rootElement]; |
| | 469 | + $mime = $types[$xml->rootElement]; |
| | 470 | + return $mime; |
| 474 | 471 | } else { |
| | 472 | + /// Fixme -- this would be the place to allow additional XML type checks |
| 475 | 473 | return 'application/xml'; |
| 476 | 474 | } |
| 477 | 475 | } |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -367,11 +367,6 @@ |
| 368 | 368 | $wgTrivialMimeDetection= false; |
| 369 | 369 | |
| 370 | 370 | /** |
| 371 | | - * Additional XML types we can allow via mime-detection. |
| 372 | | - */ |
| 373 | | -$wgAdditionalXMLTypes = array(); |
| 374 | | - |
| 375 | | -/** |
| 376 | 371 | * To set 'pretty' URL paths for actions other than |
| 377 | 372 | * plain page views, add to this array. For instance: |
| 378 | 373 | * 'edit' => "$wgScriptPath/edit/$1" |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -64,8 +64,6 @@ |
| 65 | 65 | previously it was choosen based on $wgParserCacheType |
| 66 | 66 | * $wgExtensionAliasesFiles option to simplify adding aliases to special pages |
| 67 | 67 | provided by extensions, in a similar way to $wgExtensionMessagesFiles |
| 68 | | -* Added $wgAdditionalXMLTypes, an array of XML mimetypes we can check for |
| 69 | | - with MimeMagic. |
| 70 | 68 | |
| 71 | 69 | === New features in 1.13 === |
| 72 | 70 | |