From 5c8e774cea24bd964632ae96357a308272753513 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 20 Jun 2012 08:57:21 +0200
Subject: [PATCH] Small code reorder
---
lib/util.php | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/lib/util.php b/lib/util.php
index 5492587862..f0999b6d20 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -19,17 +19,18 @@ class OC_Util {
return false;
}
- // If we are not forced to load a specific user we load the one that is logged in
- if( $user == "" && OC_User::isLoggedIn()){
- $user = OC_User::getUser();
- }
-
$CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
//first set up the local "root" storage
if(!self::$rootMounted){
OC_Filesystem::mount('OC_Filestorage_Local',array('datadir'=>$CONFIG_DATADIRECTORY),'/');
self::$rootMounted=true;
}
+
+ // If we are not forced to load a specific user we load the one that is logged in
+ if( $user == "" && OC_User::isLoggedIn()){
+ $user = OC_User::getUser();
+ }
+
if( $user != "" ){ //if we aren't logged in, there is no use to set up the filesystem
$userdirectory = $CONFIG_DATADIRECTORY."/$user/$root";
if( !is_dir( $userdirectory )){
--
GitLab