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

register app autoload instead of loading apps

This commit is contained in:
Arthur Schiwon 2016-08-12 13:23:14 +02:00
parent 82bf4796f9
commit ac04ba6784
No known key found for this signature in database
GPG Key ID: 7424F1874854DF23
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/systemtags/lib/Settings/Admin.php
View File

@ -23,19 +23,11 @@
namespace OCA\SystemTags\Settings; namespace OCA\SystemTags\Settings;
use OCA\Federation\TrustedServers;
use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Http\TemplateResponse;
use OCP\Settings\ISettings; use OCP\Settings\ISettings;
class Admin implements ISettings { class Admin implements ISettings {
/** @var TrustedServers */
private $trustedServers;
public function __construct(TrustedServers $trustedServers) {
$this->trustedServers = $trustedServers;
}
/** /**
* @return TemplateResponse * @return TemplateResponse
*/ */

3
lib/private/Installer.php
View File

@ -594,7 +594,8 @@ class Installer {
OC_App::setAppTypes($info['id']); OC_App::setAppTypes($info['id']);
if(isset($info['settings']) && is_array($info['settings'])) { 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']); \OC::$server->getSettingsManager()->setupSettings($info['settings']);
} }

9
lib/private/legacy/app.php
View File

@ -348,7 +348,8 @@ class OC_App {
$info = self::getAppInfo($app); $info = self::getAppInfo($app);
if(isset($info['settings']) && is_array($info['settings'])) { 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']); \OC::$server->getSettingsManager()->setupSettings($info['settings']);
} }
} }
@ -1170,7 +1171,8 @@ class OC_App {
} }
if(isset($info['settings']) && is_array($info['settings'])) { 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']); \OC::$server->getSettingsManager()->setupSettings($info['settings']);
} }
@ -1212,7 +1214,8 @@ class OC_App {
} }
self::setupBackgroundJobs($appData['background-jobs']); self::setupBackgroundJobs($appData['background-jobs']);
if(isset($appData['settings']) && is_array($appData['settings'])) { 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']); \OC::$server->getSettingsManager()->setupSettings($appData['settings']);
} }