From f98471892162191ab8f1aaf34ee6e6f487bb962f Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Fri, 11 Mar 2016 17:39:35 +0100 Subject: [PATCH] Adjust wording a bit **Before:** > Your PHP version (5.4.16) is no longer supported by PHP. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP. **After:** > You are currently running PHP 5.4.0. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by the PHP Group as soon as your distribution supports it. Fixes https://github.com/owncloud/enterprise/issues/1170 --- core/js/setupchecks.js | 2 +- core/js/tests/specs/setupchecksSpec.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js index c29c4137c58..41f6a6e07b6 100644 --- a/core/js/setupchecks.js +++ b/core/js/setupchecks.js @@ -117,7 +117,7 @@ } if(data.phpSupported && data.phpSupported.eol) { messages.push({ - msg: t('core', 'Your PHP version ({version}) is no longer supported by PHP. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP.', {version: data.phpSupported.version, phpLink: 'https://secure.php.net/supported-versions.php'}), + msg: t('core', 'You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by the PHP Group as soon as your distribution supports it.', {version: data.phpSupported.version, phpLink: 'https://secure.php.net/supported-versions.php'}), type: OC.SetupChecks.MESSAGE_TYPE_INFO }); } diff --git a/core/js/tests/specs/setupchecksSpec.js b/core/js/tests/specs/setupchecksSpec.js index fa0974c90f9..05be46781d6 100644 --- a/core/js/tests/specs/setupchecksSpec.js +++ b/core/js/tests/specs/setupchecksSpec.js @@ -358,7 +358,7 @@ describe('OC.SetupChecks tests', function() { async.done(function( data, s, x ){ expect(data).toEqual([{ - msg: 'Your PHP version (5.4.0) is no longer supported by PHP. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP.', + msg: 'You are currently running PHP 5.4.0. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by the PHP Group as soon as your distribution supports it.', type: OC.SetupChecks.MESSAGE_TYPE_INFO }]); done();