Merge "rdbms: make selectRowCount() use $var argument to exclude NULLs"

[lhc/web/wiklou.git] / resources / src / mediawiki / mediawiki.Upload.Dialog.js

diff --git a/resources/src/mediawiki/mediawiki.Upload.Dialog.js b/resources/src/mediawiki/mediawiki.Upload.Dialog.js
index 1809617..00c04bc 100644 (file)
--- a/resources/src/mediawiki/mediawiki.Upload.Dialog.js
+++ b/resources/src/mediawiki/mediawiki.Upload.Dialog.js
@@ -209,7 +209,7 @@
                        } );
                }
                if ( action === 'cancel' ) {
-                       return new OO.ui.Process( this.close() );
+                       return new OO.ui.Process( this.close().closed );
                }
                if ( action === 'cancelupload' ) {
                        return new OO.ui.Process( this.uploadBooklet.initialize() );