diff --git a/appinfo/ocsmsapp.php b/appinfo/ocsmsapp.php index 6e3686b..fef3576 100644 --- a/appinfo/ocsmsapp.php +++ b/appinfo/ocsmsapp.php @@ -43,13 +43,20 @@ class OcSmsApp extends App { $this->c = $container; $app = $this; + /** + * Core + */ + $container->registerService('UserId', function($c) { + return \OCP\User::getUser(); + }); + /** * Database Layer */ $container->registerService('ConfigMapper', function ($c) use ($app) { return new ConfigMapper( $c->query('ServerContainer')->getDb(), - $app->getUserId(), + $c->query('UserId'), $c->query('ServerContainer')->getCrypto() ); }); @@ -62,13 +69,6 @@ class OcSmsApp extends App { return new SmsMapper($c->query('ServerContainer')->getDb()); }); - /** - * Core - */ - $container->registerService('UserId', function($c) { - return \OCP\User::getUser(); - }); - /** * Controllers */ diff --git a/db/configmapper.php b/db/configmapper.php index e6ea71d..f66c77b 100644 --- a/db/configmapper.php +++ b/db/configmapper.php @@ -54,4 +54,6 @@ class ConfigMapper extends Mapper { return false; } } +}; + ?>