From 2a05b746848094dcf467b90d97443645e1be4bc8 Mon Sep 17 00:00:00 2001 From: Cormac Parle Date: Mon, 27 Nov 2017 09:44:19 +0000 Subject: [PATCH] Handle case when there is no handler for a file Bug: T181365 Change-Id: Ia76b9e891eeb50071ef91e1768a7ad50f6fd7563 --- includes/page/ImagePage.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/includes/page/ImagePage.php b/includes/page/ImagePage.php index c4baae445e..76ff41bc36 100644 --- a/includes/page/ImagePage.php +++ b/includes/page/ImagePage.php @@ -287,10 +287,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; } } -- 2.20.1