Merge pull request #3794 from guruz/sharing_db_call_reorder

Sharing db call reorder

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));
 	}