wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #8372 from nextcloud/encapsulate-app-require

Browse source 
Properly encapsulate require_once for app.php
This commit is contained in:
Morris Jobke 2018-02-15 15:47:22 +01:00 committed by GitHub
commit e97ae9aac5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/private/legacy/app.php
View file

@ -133,6 +133,7 @@ class OC_App {
* load a single app
*
* @param string $app
* @throws Exception
*/
public static function loadApp($app) {
self::$loadedApps[] = $app;
@ -146,7 +147,15 @@ class OC_App {
if (is_file($appPath . '/appinfo/app.php')) {
\OC::$server->getEventLogger()->start('load_app_' . $app, 'Load app: ' . $app);
self::requireAppFile($app);
try {
self::requireAppFile($app);
} catch (Error $ex) {
\OC::$server->getLogger()->logException($ex);
if (!\OC::$server->getAppManager()->isShipped($app)) {
// Only disable apps which are not shipped
self::disable($app);
}
}
if (self::isType($app, array('authentication'))) {
// since authentication apps affect the "is app enabled for group" check,
// the enabled apps cache needs to be cleared to make sure that the
@ -248,18 +257,11 @@ class OC_App {
* Load app.php from the given app
*
* @param string $app app name
* @throws Error
*/
private static function requireAppFile($app) {
try {
// encapsulated here to avoid variable scope conflicts
require_once $app . '/appinfo/app.php';
} catch (Error $ex) {
\OC::$server->getLogger()->logException($ex);
if (!\OC::$server->getAppManager()->isShipped($app)) {
// Only disable apps which are not shipped
self::disable($app);
}
}
// encapsulated here to avoid variable scope conflicts
require_once $app . '/appinfo/app.php';
}
/**