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

Fail hard if shipped.json is missing

This commit is contained in:
Thomas Müller 2015-10-26 09:52:47 +01:00
parent 5a5bcccd0d
commit 2038b2ec34
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/private/app/appmanager.php
View File

@ -297,16 +297,12 @@ class AppManager implements IAppManager {
private function loadShippedJson() { private function loadShippedJson() {
if (is_null($this->shippedApps)) { if (is_null($this->shippedApps)) {
$shippedJson = \OC::$SERVERROOT . '/core/shipped.json'; $shippedJson = \OC::$SERVERROOT . '/core/shipped.json';
if (file_exists($shippedJson)) { if (!file_exists($shippedJson)) {
throw new \Exception("File not found: $shippedJson");
}
$content = json_decode(file_get_contents($shippedJson), true); $content = json_decode(file_get_contents($shippedJson), true);
$this->shippedApps = $content['shippedApps']; $this->shippedApps = $content['shippedApps'];
$this->alwaysEnabled = $content['alwaysEnabled']; $this->alwaysEnabled = $content['alwaysEnabled'];
} else {
$this->shippedApps = ['files', 'encryption', 'files_external',
'files_sharing', 'files_trashbin', 'files_versions', 'provisioning_api',
'user_ldap', 'user_webdavauth'];
$this->alwaysEnabled = ['files', 'dav'];
}
} }
} }