register app autoload instead of loading apps

diff --git a/apps/systemtags/lib/Settings/Admin.php b/apps/systemtags/lib/Settings/Admin.php
index 351c2264397038b41767c39548e01b75b3b29446..ed72e17cf506ae0d37f056b63c3379a7e7da5448 100644 (file)
--- a/apps/systemtags/lib/Settings/Admin.php
+++ b/apps/systemtags/lib/Settings/Admin.php
@@ -23,19 +23,11 @@
 
 namespace OCA\SystemTags\Settings;
 
-use OCA\Federation\TrustedServers;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\Settings\ISettings;
 
 class Admin implements ISettings {
 
-       /** @var TrustedServers */
-       private $trustedServers;
-
-       public function __construct(TrustedServers $trustedServers) {
-               $this->trustedServers = $trustedServers;
-       }
-
        /**
         * @return TemplateResponse
         */

diff --git a/lib/private/Installer.php b/lib/private/Installer.php
index 1c45679cd32970eb504cb448683da21f54392c85..3d8a923417a5d0e70fec8a868db46df907d70f10 100644 (file)
--- a/lib/private/Installer.php
+++ b/lib/private/Installer.php
@@ -594,7 +594,8 @@ class Installer {
                OC_App::setAppTypes($info['id']);
 
                if(isset($info['settings']) && is_array($info['settings'])) {
-                       \OC_App::loadApp($app, false);
+                       // requires that autoloading was registered for the app,
+                       // as happens before running the install.php some lines above
                        \OC::$server->getSettingsManager()->setupSettings($info['settings']);
                }
 

diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php
index 4144f3f6cf502eb60e69e3734bee48c2a9bbecd9..b39f5fa789049d0749e8bd24272684da782fbd30 100644 (file)
--- a/lib/private/legacy/app.php
+++ b/lib/private/legacy/app.php
@@ -348,7 +348,8 @@ class OC_App {
 
                $info = self::getAppInfo($app);
                if(isset($info['settings']) && is_array($info['settings'])) {
-                       self::loadApp($app, false);
+                       $appPath = self::getAppPath($app);
+                       self::registerAutoloading($app, $appPath);
                        \OC::$server->getSettingsManager()->setupSettings($info['settings']);
                }
        }
@@ -1170,7 +1171,8 @@ class OC_App {
                        }
 
                        if(isset($info['settings']) && is_array($info['settings'])) {
-                               self::loadApp($app, false);
+                               $appPath = self::getAppPath($app);
+                               self::registerAutoloading($app, $appPath);
                                \OC::$server->getSettingsManager()->setupSettings($info['settings']);
                        }
 
@@ -1212,7 +1214,8 @@ class OC_App {
                }
                self::setupBackgroundJobs($appData['background-jobs']);
                if(isset($appData['settings']) && is_array($appData['settings'])) {
-                       self::loadApp($appId, false);
+                       $appPath = self::getAppPath($appId);
+                       self::registerAutoloading($appId, $appPath);
                        \OC::$server->getSettingsManager()->setupSettings($appData['settings']);
                }