From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 17 Jan 2018 16:35:02 +0000 (+0000)
Subject: Merge "Allow extension of the Special:Upload form"
X-Git-Tag: 1.31.0-rc.0~889
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=cf3bdd40a3fd22045703c1e188115fc87386fa65;p=lhc%2Fweb%2Fwiklou.git

Merge "Allow extension of the Special:Upload form"
---

cf3bdd40a3fd22045703c1e188115fc87386fa65
diff --cc RELEASE-NOTES-1.31
index 45d096d4c7,2069e71efe..307a8b534a
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@@ -168,10 -167,11 +170,11 @@@ changes to languages because of Phabric
    has been deprecated since 1.27 and was removed as well.
  * The HtmlFormatter class was removed (deprecated in 1.27). The namespaced
    HtmlFormatter\HtmlFormatter class should be used instead.
+ * License::getLicenses has been deprecated; use License::getLines instead.
  
  == Compatibility ==
 -MediaWiki 1.31 requires PHP 5.5.9 or later. There is experimental support for
 -HHVM 3.6.5 or later.
 +MediaWiki 1.31 requires PHP 5.5.9 or later. Although HHVM 3.18.5 or later is supported,
 +it is generally advised to use PHP 5.5.9 or later for long term support.
  
  MySQL/MariaDB is the recommended DBMS. PostgreSQL or SQLite can also be used,
  but support for them is somewhat less mature. There is experimental support for
diff --cc resources/src/mediawiki.special/mediawiki.special.upload.js
index 1a3f26cb26,ec51975d76..5934278330
--- a/resources/src/mediawiki.special/mediawiki.special.upload.js
+++ b/resources/src/mediawiki.special/mediawiki.special.upload.js
@@@ -132,15 -135,14 +135,15 @@@
  			( new mw.Api() ).get( {
  				formatversion: 2,
  				action: 'parse',
- 				text: '{{' + license + '}}',
+ 				text: '{{' + template + '}}',
  				title: $( '#wpDestFile' ).val() || 'File:Sample.jpg',
  				prop: 'text',
 -				pst: true
 +				pst: true,
 +				uselang: mw.config.get( 'wgUserLanguage' )
  			} ).done( function ( result ) {
- 				uploadLicense.processResult( result, license );
+ 				uploadTemplatePreview.processResult( result, template, $previewContainer );
  			} ).always( function () {
- 				$spinnerLicense.remove();
+ 				$spinner.remove();
  			} );
  		},