UploadForm: Don't set a null context
authorMark Holmquist <mtraceur@member.fsf.org>
Tue, 14 Apr 2015 18:23:20 +0000 (11:23 -0700)
committerLegoktm <legoktm.wikipedia@gmail.com>
Tue, 14 Apr 2015 18:24:49 +0000 (18:24 +0000)
Breaking Special:Specialpages on master now.

Bug: T96057
Change-Id: Ieb21b4d07af2dc8ea18016568c98b78e390ac2d5

includes/specials/SpecialUpload.php

index 8390feb..3f1ea42 100644 (file)
@@ -787,7 +787,10 @@ class UploadForm extends HTMLForm {
        protected $mMaxUploadSize = array();
 
        public function __construct( array $options = array(), IContextSource $context = null ) {
-               $this->setContext( $context );
+               if ( $context instanceof IContextSource ) {
+                       $this->setContext( $context );
+               }
+
                $this->mWatch = !empty( $options['watch'] );
                $this->mForReUpload = !empty( $options['forreupload'] );
                $this->mSessionKey = isset( $options['sessionkey'] ) ? $options['sessionkey'] : '';