Merge "Correct recent schema changes for MSSQL, Oracle"

[lhc/web/wiklou.git] / includes / media / XCF.php

diff --git a/includes/media/XCF.php b/includes/media/XCF.php
index 1b6c4c8..0cb618f 100644 (file)
--- a/includes/media/XCF.php
+++ b/includes/media/XCF.php
@@ -46,7 +46,7 @@ class XCFHandler extends BitmapHandler {
         *
         * @param string $ext
         * @param string $mime
-        * @param array $params
+        * @param array|null $params
         * @return array
         */
        function getThumbType( $ext, $mime, $params = null ) {
@@ -217,9 +217,9 @@ class XCFHandler extends BitmapHandler {
         * @return bool
         */
        public function canRender( $file ) {
-               MediaWiki\suppressWarnings();
+               Wikimedia\suppressWarnings();
                $xcfMeta = unserialize( $file->getMetadata() );
-               MediaWiki\restoreWarnings();
+               Wikimedia\restoreWarnings();
                if ( isset( $xcfMeta['colorType'] ) && $xcfMeta['colorType'] === 'index-coloured' ) {
                        return false;
                }