mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't disable apps on update if PHP >= 7.0.0 

When PHP in a version higher than 7.0.0 is used we catch fatal exceptions in app.php and gracefully already disable the app. There is thus no need to also disable the apps on updates.

This has been requested by Jan to fix because that is "the most annoying thing ever" :TM:. – I'd say we give it a try and if that causes problems in the future we can consider alternative approaches.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
This commit is contained in:
Lukas Reschke 2016-12-15 16:08:04 +01:00
parent 3714a6aaf0
commit 776f5bcd34
No known key found for this signature in database
GPG Key ID: B9F6980CF6E759B1
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/private/Updater.php
View File

@ -82,6 +82,12 @@ class Updater extends BasicEmitter {
$this->log = $log; $this->log = $log;
$this->config = $config; $this->config = $config;
$this->checker = $checker; $this->checker = $checker;
// If at least PHP 7.0.0 is used we don't need to disable apps as we catch
// fatal errors and exceptions and disable the app just instead.
if(version_compare(phpversion(), '7.0.0', '>=')) {
$this->skip3rdPartyAppsDisable = true;
}
} }
/** /**

2
version.php
View File

@ -26,7 +26,7 @@
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
// when updating major/minor version number. // when updating major/minor version number.
$OC_Version = array(12, 0, 0, 10); $OC_Version = array(12, 0, 0, 11);
// The human readable string // The human readable string
$OC_VersionString = '12.0 alpha'; $OC_VersionString = '12.0 alpha';