From c9fa6a7fc9fc26fb1b95ee810bfbf8afa6f51f41 Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Tue, 6 Jan 2015 13:53:46 +0000
Subject: [PATCH] Fix ordering into app loader. Also fix a syntax... newbie...
 issue

---
 appinfo/ocsmsapp.php | 16 ++++++++--------
 db/configmapper.php  |  2 ++
 2 files changed, 10 insertions(+), 8 deletions(-)

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;
 		}
 	}
+};
+
 ?>