Handle case when there is no handler for a file

Bug: T181365
Change-Id: Ia76b9e891eeb50071ef91e1768a7ad50f6fd7563

diff --git a/includes/page/ImagePage.php b/includes/page/ImagePage.php
index c4baae4..76ff41b 100644 (file)
--- 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;
                        }
                }