Merge "Chinese Conversion Table Update 2017-6"

[lhc/web/wiklou.git] / includes / page / ImagePage.php

diff --git a/includes/page/ImagePage.php b/includes/page/ImagePage.php
index c4baae4..8724c45 100644 (file)
--- a/includes/page/ImagePage.php
+++ b/includes/page/ImagePage.php
@@ -251,13 +251,14 @@ class ImagePage extends Article {
        protected function makeMetadataTable( $metadata ) {
                $r = "<div class=\"mw-imagepage-section-metadata\">";
                $r .= $this->getContext()->msg( 'metadata-help' )->plain();
-               $r .= "<table id=\"mw_metadata\" class=\"mw_metadata\">\n";
+               // Intial state is collapsed
+               // see filepage.css and mediawiki.action.view.metadata module.
+               $r .= "<table id=\"mw_metadata\" class=\"mw_metadata collapsed\">\n";
                foreach ( $metadata as $type => $stuff ) {
                        foreach ( $stuff as $v ) {
                                $class = str_replace( ' ', '_', $v['id'] );
                                if ( $type == 'collapsed' ) {
-                                       // Handled by mediawiki.action.view.metadata module.
-                                       $class .= ' collapsable';
+                                       $class .= ' mw-metadata-collapsible';
                                }
                                $r .= Html::rawElement( 'tr',
                                        [ 'class' => $class ],
@@ -287,10 +288,13 @@ class ImagePage extends Article {
 
        private function getLanguageForRendering( WebRequest $request, File $file ) {
                $handler = $this->displayImg->getHandler();
+               if ( !$handler ) {
+                       return null;
+               }
 
                $requestLanguage = $request->getVal( 'lang' );
                if ( !is_null( $requestLanguage ) ) {
-                       if ( $handler && $handler->validateParam( 'lang', $requestLanguage ) ) {
+                       if ( $handler->validateParam( 'lang', $requestLanguage ) ) {
                                return $requestLanguage;
                        }
                }
@@ -586,7 +590,7 @@ EOT
                                # Show deletion log to be consistent with normal articles
                                LogEventsList::showLogExtract(
                                        $out,
-                                       [ 'delete', 'move' ],
+                                       [ 'delete', 'move', 'protect' ],
                                        $this->getTitle()->getPrefixedText(),
                                        '',
                                        [ 'lim' => 10,
@@ -628,7 +632,7 @@ EOT
         * @param string $sizeLinkBigImagePreview HTML for the current size
         * @return string HTML output
         */
-       private function getThumbPrevText( $params, $sizeLinkBigImagePreview ) {
+       protected function getThumbPrevText( $params, $sizeLinkBigImagePreview ) {
                if ( $sizeLinkBigImagePreview ) {
                        // Show a different message of preview is different format from original.
                        $previewTypeDiffers = false;
@@ -666,7 +670,7 @@ EOT
         * @param int $height
         * @return string
         */
-       private function makeSizeLink( $params, $width, $height ) {
+       protected function makeSizeLink( $params, $width, $height ) {
                $params['width'] = $width;
                $params['height'] = $height;
                $thumbnail = $this->displayImg->transform( $params );