diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2015-12-20 09:00:55 +0100 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2015-12-20 09:00:55 +0100 |
commit | a2190ac74dd4d7080b12bab90e552d7aa81209ef (patch) | |
tree | 8b31f38de9882d18df54cf8d9e0de74167a094eb /includes/media/SVGMetadataExtractor.php | |
parent | 15e69f7b20b6596b9148030acce5b59993b95a45 (diff) | |
parent | 257401d8b2cf661adf36c84b0e3fd1cf85e33c22 (diff) |
Merge branch 'mw-1.26'
Diffstat (limited to 'includes/media/SVGMetadataExtractor.php')
-rw-r--r-- | includes/media/SVGMetadataExtractor.php | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/includes/media/SVGMetadataExtractor.php b/includes/media/SVGMetadataExtractor.php index 2037c331..1ec2f814 100644 --- a/includes/media/SVGMetadataExtractor.php +++ b/includes/media/SVGMetadataExtractor.php @@ -108,17 +108,17 @@ class SVGReader { // Because we cut off the end of the svg making an invalid one. Complicated // try catch thing to make sure warnings get restored. Seems like there should // be a better way. - wfSuppressWarnings(); + MediaWiki\suppressWarnings(); try { $this->read(); } catch ( Exception $e ) { // Note, if this happens, the width/height will be taken to be 0x0. // Should we consider it the default 512x512 instead? - wfRestoreWarnings(); + MediaWiki\restoreWarnings(); libxml_disable_entity_loader( $oldDisable ); throw $e; } - wfRestoreWarnings(); + MediaWiki\restoreWarnings(); libxml_disable_entity_loader( $oldDisable ); } @@ -262,7 +262,6 @@ class SVGReader { } elseif ( $this->reader->namespaceURI == self::NS_SVG && $this->reader->nodeType == XMLReader::ELEMENT ) { - $sysLang = $this->reader->getAttribute( 'systemLanguage' ); if ( !is_null( $sysLang ) && $sysLang !== '' ) { // See http://www.w3.org/TR/SVG/struct.html#SystemLanguageAttribute @@ -320,16 +319,6 @@ class SVGReader { } } - // @todo FIXME: Unused, remove? - private function warn( $data ) { - wfDebug( "SVGReader: $data\n" ); - } - - // @todo FIXME: Unused, remove? - private function notice( $data ) { - wfDebug( "SVGReader WARN: $data\n" ); - } - /** * Parse the attributes of an SVG element * |