Parcourir la source

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>
tags/v12.0.0beta1
Lukas Reschke il y a 7 ans
Parent
révision
776f5bcd34
Aucun compte lié à l'adresse e-mail de l'auteur
2 fichiers modifiés avec 7 ajouts et 1 suppressions
  1. 6
    0
      lib/private/Updater.php
  2. 1
    1
      version.php

+ 6
- 0
lib/private/Updater.php Voir le fichier

@@ -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;
}
}

/**

+ 1
- 1
version.php Voir le fichier

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

Chargement…
Annuler
Enregistrer