From 4032cc016627b5079775c268c3e28867ce234d26 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Mon, 8 Feb 2016 09:19:16 +0100
Subject: Don't show "report this to the community" when the upgrade is
 unsupported

* fixes #21367
---
 core/js/update.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'core/js/update.js')

diff --git a/core/js/update.js b/core/js/update.js
index 1626b6f2c49..7011e350de6 100644
--- a/core/js/update.js
+++ b/core/js/update.js
@@ -60,12 +60,16 @@
 			updateEventSource.listen('failure', function(message) {
 				$(window).off('beforeunload.inprogress');
 				$('<span>').addClass('error').append(message).append('<br />').appendTo($el);
-				$('<span>')
-				.addClass('bold')
-				.append(t('core', 'The update was unsuccessful. ' +
-					'Please report this issue to the ' +
-					'<a href="https://github.com/owncloud/core/issues" target="_blank">ownCloud community</a>.'))
-				.appendTo($el);
+				var span = $('<span>')
+					.addClass('bold');
+				if(message === 'Exception: Updates between multiple major versions and downgrades are unsupported.') {
+					span.append(t('core', 'The update was unsuccessful.'));
+				} else {
+					span.append(t('core', 'The update was unsuccessful. ' +
+						'Please report this issue to the ' +
+						'<a href="https://github.com/owncloud/core/issues" target="_blank">ownCloud community</a>.'));
+				}
+				span.appendTo($el);
 			});
 			updateEventSource.listen('done', function() {
 				$(window).off('beforeunload.inprogress');
-- 
cgit v1.2.3


From 25aad470c159421ec523988e12832dcc78163f28 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Mon, 8 Feb 2016 10:28:20 +0100
Subject: Add message with reference to forum post

---
 core/js/update.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/js/update.js')

diff --git a/core/js/update.js b/core/js/update.js
index 7011e350de6..77ac1bb20ff 100644
--- a/core/js/update.js
+++ b/core/js/update.js
@@ -63,7 +63,7 @@
 				var span = $('<span>')
 					.addClass('bold');
 				if(message === 'Exception: Updates between multiple major versions and downgrades are unsupported.') {
-					span.append(t('core', 'The update was unsuccessful.'));
+					span.append(t('core', 'The update was unsuccessful. For more information <a href="{url}">check our forum post</a> covering this issue.', {'url': 'https://forum.owncloud.org/viewtopic.php?f=17&t=32087'}));
 				} else {
 					span.append(t('core', 'The update was unsuccessful. ' +
 						'Please report this issue to the ' +
-- 
cgit v1.2.3