[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Handle case when there is no handler for a file

[Cparle (Code Review)]

Cparle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393555 )

Change subject: Handle case when there is no handler for a file
......................................................................

Handle case when there is no handler for a file

Bug: T181365
Change-Id: Ia76b9e891eeb50071ef91e1768a7ad50f6fd7563
---
M includes/page/ImagePage.php
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/55/393555/1

diff --git a/includes/page/ImagePage.php b/includes/page/ImagePage.php
index c4baae4..76ff41b 100644
--- a/includes/page/ImagePage.php
+++ b/includes/page/ImagePage.php
@@ -287,10 +287,13 @@
 
        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;
                        }
                }

-- 
To view, visit https://gerrit.wikimedia.org/r/393555
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia76b9e891eeb50071ef91e1768a7ad50f6fd7563
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Cparle <cpa...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits