Merge "Allow extension of the Special:Upload form"

diff --cc RELEASE-NOTES-1.31
index 45d096d,2069e71..307a8b5
--- 1/RELEASE-NOTES-1.31
--- 2/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 docs/hooks.txt
Simple merge

diff --cc includes/specials/formfields/Licenses.php
Simple merge

diff --cc resources/src/mediawiki.special/mediawiki.special.upload.js
index 1a3f26c,ec51975..5934278
--- 1/resources/src/mediawiki.special/mediawiki.special.upload.js
--- 2/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();
                        } );
                },