Fix conflict

This commit is contained in:
Thomas Tanghus 2013-09-23 23:48:28 +02:00
commit 7cad510f28
1 changed files with 4 additions and 3 deletions

View File

@ -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 */