From: Lukas Reschke <lukas@statuscode.ch>
Date: Thu, 15 Dec 2016 15:08:04 +0000 (+0100)
Subject: Don't disable apps on update if PHP >= 7.0.0
X-Git-Tag: v12.0.0beta1~834^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=776f5bcd345b77b05cbb9cd3fd234f3ba40eac25;p=nextcloud-server.git

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>
---

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';