Browse Source

Register autoloading before running migrations

Signed-off-by: Joas Schilling <coding@schilljs.com>
tags/v13.0.0beta1
Joas Schilling 7 years ago
parent
commit
7a3d83d630
2 changed files with 4 additions and 2 deletions
  1. 2
    1
      lib/private/Installer.php
  2. 2
    1
      lib/private/legacy/app.php

+ 2
- 1
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);

+ 2
- 1
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']);

Loading…
Cancel
Save