diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2016-12-15 18:31:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-15 18:31:54 +0100 |
| commit | ee9f46b13f0f7cf440233a67b823a4f5218b0b21 (patch) | |
| tree | 75c286fb22658e72c7fc089c9ee64fd2d039c31c | |
| parent | 5b474e72d5636462d1aa9fed96b4aa77936b1a24 (diff) | |
| parent | 776f5bcd345b77b05cbb9cd3fd234f3ba40eac25 (diff) | |
| download | nextcloud-server-ee9f46b13f0f7cf440233a67b823a4f5218b0b21.tar.gz nextcloud-server-ee9f46b13f0f7cf440233a67b823a4f5218b0b21.zip | |
Merge pull request #2698 from nextcloud/dont-disable-apps-on-update-if-at-least-php7
Don't disable apps on update if PHP >= 7.0.0
| -rw-r--r-- | lib/private/Updater.php | 6 | ||||
| -rw-r--r-- | version.php | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/private/Updater.php b/lib/private/Updater.php index e30777227cc..a66d49941cd 100644 --- a/lib/private/Updater.php +++ b/lib/private/Updater.php @@ -82,6 +82,12 @@ class Updater extends BasicEmitter { $this->log = $log; $this->config = $config; $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; + } } /** diff --git a/version.php b/version.php index 3703bbcb09e..6db26c8c66c 100644 --- a/version.php +++ b/version.php @@ -26,7 +26,7 @@ // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // when updating major/minor version number. -$OC_Version = array(12, 0, 0, 10); +$OC_Version = array(12, 0, 0, 11); // The human readable string $OC_VersionString = '12.0 alpha'; |