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

Merge pull request #11634 from owncloud/loadapps-encapsulaterequire 

Encapsulate require_once to avoid name space bleedind
This commit is contained in:
Lukas Reschke 2014-10-17 14:32:10 +02:00
parent 2e875bc6b6 27c22f071d
commit 439b33ec38
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/private/app.php
View File

@ -92,7 +92,7 @@ class OC_App {
if ($checkUpgrade and self::shouldUpgrade($app)) {
throw new \OC\NeedsUpdateException();
}
require_once $app . '/appinfo/app.php';
self::requireAppFile($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
@ -103,6 +103,16 @@ class OC_App {
}
}
/**
* Load app.php from the given app
*
* @param string $app app name
*/
private static function requireAppFile($app) {
// encapsulated here to avoid variable scope conflicts
require_once $app . '/appinfo/app.php';
}
/**
* check if an app is of a specific type
*