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

Register autoloading before running migrations

Browse source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2017-06-09 14:49:40 +02:00 committed by Morris Jobke
parent 6a0da09734
commit 7a3d83d630
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/private/Installer.php
View file

@ -533,6 +533,8 @@ class Installer {
public static function installShippedApp($app) {
//install the database
$appPath = OC_App::getAppPath($app);
\OC_App::registerAutoloading($app, $appPath);
if(is_file("$appPath/appinfo/database.xml")) {
try {
OC_DB::createDbFromStructure("$appPath/appinfo/database.xml");
@ -549,7 +551,6 @@ class Installer {
}
//run appinfo/install.php
\OC_App::registerAutoloading($app, $appPath);
self::includeAppScript("$appPath/appinfo/install.php");
$info = OC_App::getAppInfo($app);

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

@ -1042,6 +1042,8 @@ class OC_App {
if($appPath === false) {
return false;
}
self::registerAutoloading($appId, $appPath);
$appData = self::getAppInfo($appId);
self::executeRepairSteps($appId, $appData['repair-steps']['pre-migration']);
@ -1061,7 +1063,6 @@ class OC_App {
self::loadApp($appId);
include $appPath . '/appinfo/update.php';
}
self::registerAutoloading($appId, $appPath);
self::setupBackgroundJobs($appData['background-jobs']);
if(isset($appData['settings']) && is_array($appData['settings'])) {
\OC::$server->getSettingsManager()->setupSettings($appData['settings']);