diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2021-02-10 18:02:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-10 18:02:24 +0100 |
| commit | 847ee4041ae140dd3ca32f6388a817f63ba3836a (patch) | |
| tree | 5faea3e9dad8aa5b51a0518908a5b3540042f242 | |
| parent | 039ecbdcf9d0798b612b6cb02203c0cd6e930100 (diff) | |
| parent | 25f9203a702cb71be5221214d9c46869b1c2cb79 (diff) | |
| download | nextcloud-server-847ee4041ae140dd3ca32f6388a817f63ba3836a.tar.gz nextcloud-server-847ee4041ae140dd3ca32f6388a817f63ba3836a.zip | |
Merge pull request #25566 from nextcloud/fix/25359/followup
Fix remaining #25359
| -rw-r--r-- | lib/private/AppFramework/Bootstrap/RegistrationContext.php | 5 | ||||
| -rw-r--r-- | lib/private/legacy/OC_App.php | 10 |
2 files changed, 6 insertions, 9 deletions
diff --git a/lib/private/AppFramework/Bootstrap/RegistrationContext.php b/lib/private/AppFramework/Bootstrap/RegistrationContext.php index 619e4f55011..fc13a78f3d3 100644 --- a/lib/private/AppFramework/Bootstrap/RegistrationContext.php +++ b/lib/private/AppFramework/Bootstrap/RegistrationContext.php @@ -271,10 +271,7 @@ class RegistrationContext { } public function registerTemplateProvider(string $appId, string $class): void { - $this->templateProviders[] = [ - 'appId' => $appId, - 'class' => $class, - ]; + $this->templateProviders[] = new ServiceRegistration($appId, $class); } /** diff --git a/lib/private/legacy/OC_App.php b/lib/private/legacy/OC_App.php index 530291002bb..d48d6c40810 100644 --- a/lib/private/legacy/OC_App.php +++ b/lib/private/legacy/OC_App.php @@ -709,12 +709,12 @@ class OC_App { try { /** @var IAlternativeLogin $provider */ - $provider = \OC::$server->query($registration['class']); + $provider = \OC::$server->query($registration->getService()); } catch (QueryException $e) { \OC::$server->getLogger()->logException($e, [ 'message' => 'Alternative login option {option} can not be initialised.', - 'option' => $registration['class'], - 'app' => $registration['app'], + 'option' => $registration->getService(), + 'app' => $registration->getAppId(), ]); } @@ -729,8 +729,8 @@ class OC_App { } catch (Throwable $e) { \OC::$server->getLogger()->logException($e, [ 'message' => 'Alternative login option {option} had an error while loading.', - 'option' => $registration['class'], - 'app' => $registration['app'], + 'option' => $registration->getService(), + 'app' => $registration->getAppId(), ]); } } |