Merge "mediawiki.util: Don't hardcode selectors in updateTooltipAccessKeys if possible"

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

diff --git a/includes/media/SVG.php b/includes/media/SVG.php
index 17891fc..ce7fcbb 100644 (file)
--- a/includes/media/SVG.php
+++ b/includes/media/SVG.php
@@ -94,7 +94,7 @@ class SvgHandler extends ImageHandler {
                if ( $metadata ) {
                        $metadata = $this->unpackMetadata( $metadata );
                        if ( isset( $metadata['translations'] ) ) {
-                               foreach( $metadata['translations'] as $lang => $langType ) {
+                               foreach ( $metadata['translations'] as $lang => $langType ) {
                                        if ( $langType === SvgReader::LANG_FULL_MATCH ) {
                                                $langList[] = $lang;
                                        }
@@ -368,7 +368,7 @@ class SvgHandler extends ImageHandler {
                return self::METADATA_GOOD;
        }
 
-       function visibleMetadataFields() {
+       protected function visibleMetadataFields() {
                $fields = array( 'objectname', 'imagedescription' );
 
                return $fields;
@@ -432,7 +432,7 @@ class SvgHandler extends ImageHandler {
                        return ( $value > 0 );
                } elseif ( $name == 'lang' ) {
                        // Validate $code
-                       if ( !Language::isValidBuiltinCode( $value ) ) {
+                       if ( $value === '' || !Language::isValidBuiltinCode( $value ) ) {
                                wfDebug( "Invalid user language code\n" );
 
                                return false;