diff options
author | Lukas Reschke <lukas@statuscode.ch> | 2013-04-09 03:04:46 -0700 |
---|---|---|
committer | Lukas Reschke <lukas@statuscode.ch> | 2013-04-09 03:04:46 -0700 |
commit | 5ef876288673ec867e21e877f1291ada973c31b9 (patch) | |
tree | 8fa881f7936aa522618e01b053ada783d8737258 | |
parent | b52666567aa27a05c78c7b731aef7700901567d3 (diff) | |
parent | 1e580bf04b2f29411f41331c2188061edd2dbd37 (diff) | |
download | nextcloud-server-5ef876288673ec867e21e877f1291ada973c31b9.tar.gz nextcloud-server-5ef876288673ec867e21e877f1291ada973c31b9.zip |
Merge pull request #2786 from owncloud/disable-archive-app
manually disable archive app for stable5 to fix upgrade problems
-rw-r--r-- | lib/app.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/app.php b/lib/app.php index 55b4543ec9f..272c53f2706 100644 --- a/lib/app.php +++ b/lib/app.php @@ -851,7 +851,11 @@ class OC_App{ foreach($apps as $app) { // check if the app is compatible with this version of ownCloud $info = OC_App::getAppInfo($app); - if(!isset($info['require']) or !self::isAppVersionCompatible($version, $info['require'])) { + if(!isset($info['require']) + or !self::isAppVersionCompatible($version, $info['require']) + // manually disable files_archive app since it has been removed + // and cause update problems + or $app === 'files_archive') { OC_Log::write('core', 'App "'.$info['name'].'" ('.$app.') can\'t be used because it is' .' not compatible with this version of ownCloud', |