Merge commit 'fa89acd'

# Conflicts:
#	.gitignore
#	extensions/ArchInterWiki.sql

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
 	 *