dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Avoid INSERT..SELECT in doArticleDeleteReal()"
[lhc/web/wiklou.git]
/
resources
/
src
/
mediawiki
/
mediawiki.ForeignUpload.js
diff --git
a/resources/src/mediawiki/mediawiki.ForeignUpload.js
b/resources/src/mediawiki/mediawiki.ForeignUpload.js
index
1a0b59a
..
781c1df
100644
(file)
--- a/
resources/src/mediawiki/mediawiki.ForeignUpload.js
+++ b/
resources/src/mediawiki/mediawiki.ForeignUpload.js
@@
-43,7
+43,9
@@
// However, if the target is a remote wiki, we must check the API
// to confirm that the target is one that this site is configured to
// support.
// However, if the target is a remote wiki, we must check the API
// to confirm that the target is one that this site is configured to
// support.
- if ( this.target === 'local' ) {
+ if ( validTargets.length === 0 ) {
+ this.apiPromise = $.Deferred().reject( 'upload-dialog-disabled' );
+ } else if ( this.target === 'local' ) {
// If local uploads were requested, but they are disabled, fail.
if ( !mw.config.get( 'wgEnableUploads' ) ) {
this.apiPromise = $.Deferred().reject( 'uploaddisabledtext' );
// If local uploads were requested, but they are disabled, fail.
if ( !mw.config.get( 'wgEnableUploads' ) ) {
this.apiPromise = $.Deferred().reject( 'uploaddisabledtext' );
@@
-85,12
+87,6
@@
// actual API call methods to wait for the apiPromise to resolve
// before continuing.
mw.Upload.call( this, null );
// actual API call methods to wait for the apiPromise to resolve
// before continuing.
mw.Upload.call( this, null );
-
- if ( this.target !== 'local' ) {
- // Keep these untranslated. We don't know the content language of the foreign wiki, best to
- // stick to English in the text.
- this.setComment( 'Cross-wiki upload from ' + location.host );
- }
}
OO.inheritClass( ForeignUpload, mw.Upload );
}
OO.inheritClass( ForeignUpload, mw.Upload );