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

Merge pull request #19039 from owncloud/setup-autoloader-earlier 

Define allowed app roots earlier
This commit is contained in:
Thomas Müller 2015-09-15 13:24:35 +02:00
parent 1d315512ea 8e1b403b16
commit b6fe5b6f3c
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/private/app.php
View File

@ -101,6 +101,15 @@ class OC_App {
}
// Load the enabled apps here
$apps = self::getEnabledApps();
// Add each apps' folder as allowed class path
foreach($apps as $app) {
$path = self::getAppPath($app);
if($path !== false) {
\OC::$loader->addValidRoot($path);
}
}
// prevent app.php from printing output
ob_start();
foreach ($apps as $app) {
@ -122,7 +131,6 @@ class OC_App {
*/
public static function loadApp($app, $checkUpgrade = true) {
self::$loadedApps[] = $app;
\OC::$loader->addValidRoot(self::getAppPath($app));
if (is_file(self::getAppPath($app) . '/appinfo/app.php')) {
\OC::$server->getEventLogger()->start('load_app_' . $app, 'Load app: ' . $app);
if ($checkUpgrade and self::shouldUpgrade($app)) {