Merge "mw.Upload.BookletLayout: Go back to upload page on upload error"

diff --cc resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
index df28611,d75e1d3..42312dd
--- 1/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
--- 2/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
+++ b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
@@@ -188,11 -191,11 +191,13 @@@
                        deferred.resolve();
                        layout.emit( 'fileUploaded' );
                } );
+ 
+               // These errors will be thrown while the user is on the info page
                this.uploadPromise.always( function () {
                        if ( layout.upload.getState() === mw.Upload.State.ERROR ) {
 -                              deferred.reject( new OO.ui.Error( mw.msg( 'upload-process-error' )  ) );
 +                              deferred.reject( new OO.ui.Error( mw.msg( 'upload-process-error' ), {
 +                                      recoverable: false
 +                              } ) );
                                return false;
                        }
                        if ( layout.upload.getState() === mw.Upload.State.WARNING ) {