X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fmedia%2FSVGMetadataExtractor.php;h=fc93b2331f223cd2aabac0fd9a3ec9305d1510f8;hb=9a37fb8e4851d13bfb208eb886c9947a7f21571c;hp=4087fb3d5b38989dd1b7af4ba57e768e0e5ca58c;hpb=55043101b2a89ea1e811b6d35e415f57ed0bf41d;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/media/SVGMetadataExtractor.php b/includes/media/SVGMetadataExtractor.php index 4087fb3d5b..fc93b2331f 100644 --- a/includes/media/SVGMetadataExtractor.php +++ b/includes/media/SVGMetadataExtractor.php @@ -58,8 +58,6 @@ class SVGReader { private $languagePrefixes = []; /** - * Constructor - * * Creates an SVGReader drawing from the source provided * @param string $source URI from which to read * @throws MWException|Exception @@ -108,17 +106,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. - MediaWiki\suppressWarnings(); + Wikimedia\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? - MediaWiki\restoreWarnings(); + Wikimedia\restoreWarnings(); libxml_disable_entity_loader( $oldDisable ); throw $e; } - MediaWiki\restoreWarnings(); + Wikimedia\restoreWarnings(); libxml_disable_entity_loader( $oldDisable ); } @@ -307,12 +305,6 @@ class SVGReader { } } - // @todo FIXME: Unused, remove? - private function throwXmlError( $err ) { - $this->debug( "FAILURE: $err" ); - wfDebug( "SVGReader XML error: $err\n" ); - } - private function debug( $data ) { if ( $this->mDebug ) { wfDebug( "SVGReader: $data\n" );