diff options
| author | Robin Appelman <icewind1991@gmail.com> | 2011-10-18 21:19:13 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind1991@gmail.com> | 2011-10-18 21:19:13 +0200 |
| commit | b975f1151451785f8350a12bf63d8fd63f0d04b4 (patch) | |
| tree | b75af170f28214636ebee26dfe2235e3dbaff338 /lib | |
| parent | 28ab39073a8ea942a7c299dc41ddf6023dd093de (diff) | |
| download | nextcloud-server-b975f1151451785f8350a12bf63d8fd63f0d04b4.tar.gz nextcloud-server-b975f1151451785f8350a12bf63d8fd63f0d04b4.zip | |
make sharing work with the new mouting mechanism
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 14 | ||||
| -rw-r--r-- | lib/filesystem.php | 2 | ||||
| -rw-r--r-- | lib/util.php | 3 |
3 files changed, 8 insertions, 11 deletions
diff --git a/lib/base.php b/lib/base.php index ade4d889631..8adb1cc9102 100644 --- a/lib/base.php +++ b/lib/base.php @@ -154,13 +154,6 @@ class OC{ OC_User::useBackend( OC_Config::getValue( "userbackend", "database" )); OC_Group::setBackend( OC_Config::getValue( "groupbackend", "database" )); - // Load Apps - // This includes plugins for users and filesystems as well - global $RUNTIME_NOAPPS; - if(!$RUNTIME_NOAPPS ){ - OC_App::loadApps(); - } - // Was in required file ... put it here OC_Filesystem::registerStorageType('local','OC_Filestorage_Local',array('datadir'=>'string')); @@ -170,6 +163,13 @@ class OC{ OC_Util::setupFS(); } + // Load Apps + // This includes plugins for users and filesystems as well + global $RUNTIME_NOAPPS; + if(!$RUNTIME_NOAPPS ){ + OC_App::loadApps(); + } + // Last part: connect some hooks OC_HOOK::connect('OC_User', 'post_createUser', 'OC_Connector_Sabre_Principal', 'addPrincipal'); OC_HOOK::connect('OC_User', 'post_deleteUser', 'OC_Connector_Sabre_Principal', 'deletePrincipal'); diff --git a/lib/filesystem.php b/lib/filesystem.php index 60fd051f303..3497431f1ee 100644 --- a/lib/filesystem.php +++ b/lib/filesystem.php @@ -168,7 +168,7 @@ class OC_Filesystem{ if(substr($mountpoint,0,1)!=='/'){ $mountpoint='/'.$mountpoint; } - self::$mounts[self::$fakeRoot.$mountpoint]=array('type'=>$type,'arguments'=>$arguments); + self::$mounts[$mountpoint]=array('type'=>$type,'arguments'=>$arguments); } /** diff --git a/lib/util.php b/lib/util.php index ec92a986008..90cc1f6123a 100644 --- a/lib/util.php +++ b/lib/util.php @@ -39,9 +39,6 @@ class OC_Util { //first set up the local "root" storage OC_Filesystem::mount('local',array('datadir'=>$CONFIG_DATADIRECTORY_ROOT),'/'); - // TODO add this storage provider in a proper way - OC_Filesystem::mount('shared',array('datadir'=>'/'.OC_User::getUser().'/files/Shared'),'/'.OC_User::getUser().'/files/Shared/'); - OC::$CONFIG_DATADIRECTORY = $CONFIG_DATADIRECTORY_ROOT."/$user/$root"; if( !is_dir( OC::$CONFIG_DATADIRECTORY )){ mkdir( OC::$CONFIG_DATADIRECTORY, 0755, true ); |