diff options
author | Lukas Reschke <lukas@statuscode.ch> | 2013-06-21 23:55:39 +0400 |
---|---|---|
committer | Lukas Reschke <lukas@statuscode.ch> | 2013-06-21 23:55:39 +0400 |
commit | f0b91d73020c194bec2535f8a15c7117ff71b745 (patch) | |
tree | 299f909f5c999f737c810ed580987b6576b7f372 | |
parent | cac5cf1839e8c376d4e99852be32062410e4a8a7 (diff) | |
parent | cb5faf5d87e9b8bebdca6937bfeff8cf78a4f396 (diff) |
Merge pull request #3794 from guruz/sharing_db_call_reorder
Sharing db call reorder
-rw-r--r-- | lib/connector/sabre/node.php | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php index bac441879e8..792c40521b9 100644 --- a/lib/connector/sabre/node.php +++ b/lib/connector/sabre/node.php @@ -277,21 +277,21 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr $query->execute(array_merge( $vals, $paths )); //remove etag for all Shared folders - $query = OC_DB::prepare( 'DELETE FROM `*PREFIX*properties`'
- .' WHERE `propertypath` = \'/Shared\' '
- );
+ $query = OC_DB::prepare( 'DELETE FROM `*PREFIX*properties`' + .' WHERE `propertypath` = \'/Shared\' ' + ); $query->execute(array()); } protected static function getFileSource($path) { - if ( OC_App::isEnabled('files_sharing') && !strncmp($path, '/Shared/', 8)) {
- $source = OC_Files_Sharing_Util::getSourcePath(str_replace('/Shared/', '', $path));
- $parts = explode('/', $source, 4);
- $user = $parts[1];
- $path = '/'.$parts[3];
- } else {
- $user = OC_User::getUser();
+ if (!strncmp($path, '/Shared/', 8) && OC_App::isEnabled('files_sharing')) { + $source = OC_Files_Sharing_Util::getSourcePath(str_replace('/Shared/', '', $path)); + $parts = explode('/', $source, 4); + $user = $parts[1]; + $path = '/'.$parts[3]; + } else { + $user = OC_User::getUser(); } return(array('user' => $user, 'path' => $path)); } |