diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2013-09-23 23:48:28 +0200 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2013-09-23 23:48:28 +0200 |
| commit | 7cad510f28e3d80de06cb98bbc5915b26dfa35d3 (patch) | |
| tree | 8bb436bb98d0d557abc5a2168e52af96ac6ac9e0 /lib | |
| parent | f022ea752ddd86feccaaf5f1f83f808fd6df5e20 (diff) | |
| parent | d27416edf767219f77a828d22bb070345a179631 (diff) | |
| download | nextcloud-server-7cad510f28e3d80de06cb98bbc5915b26dfa35d3.tar.gz nextcloud-server-7cad510f28e3d80de06cb98bbc5915b26dfa35d3.zip | |
Fix conflict
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/server.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/server.php b/lib/server.php index b09d380b0e9..f3c79aa797f 100644 --- a/lib/server.php +++ b/lib/server.php @@ -49,10 +49,11 @@ class Server extends SimpleContainer implements IServerContainer { $this->registerService('PreviewManager', function($c) { return new PreviewManager(); }); - $this->registerService('TagManager', function($c){ - return new Tags(); + $this->registerService('TagManager', function($c) { + $user = \OC_User::getUser(); + return new Tags($user); }); - $this->registerService('RootFolder', function($c){ + $this->registerService('RootFolder', function($c) { // TODO: get user and user manager from container as well $user = \OC_User::getUser(); /** @var $c SimpleContainer */ |