From: Michael Gapczynski <mtgap@owncloud.com>
Date: Thu, 28 Feb 2013 15:39:23 +0000 (-0500)
Subject: Merge branch 'master' into shared-folder-etags
X-Git-Tag: v5.0.0~4^2~12
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b5989c933f3c51887724d89e989a3e2af4207d6e;p=nextcloud-server.git

Merge branch 'master' into shared-folder-etags

Conflicts:
	apps/files_sharing/lib/sharedstorage.php
---

b5989c933f3c51887724d89e989a3e2af4207d6e
diff --cc apps/files_sharing/lib/sharedstorage.php
index 0163f2e00b4,5a9864b64ba..19abc838258
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@@ -409,12 -392,12 +411,15 @@@ class Shared extends \OC\Files\Storage\
  	}
  
  	public static function setup($options) {
- 		if (!\OCP\User::isLoggedIn() || \OCP\User::getUser() != $options['user'] || \OCP\Share::getItemsSharedWith('file')) {
+ 		if (!\OCP\User::isLoggedIn() || \OCP\User::getUser() != $options['user']
+ 			|| \OCP\Share::getItemsSharedWith('file')) {
  			$user_dir = $options['user_dir'];
- 			\OC\Files\Filesystem::mount('\OC\Files\Storage\Shared', array('sharedFolder' => '/Shared'), $user_dir.'/Shared/');
+ 			\OC\Files\Filesystem::mount('\OC\Files\Storage\Shared',
+ 				array('sharedFolder' => '/Shared'),
+ 				$user_dir.'/Shared/');
 +			\OC_Hook::connect('OC_Filesystem', 'post_write', '\OC\Files\Cache\Shared_Updater', 'writeHook');
 +			\OC_Hook::connect('OC_Filesystem', 'post_delete', '\OC\Files\Cache\Shared_Updater', 'deleteHook');
 +			\OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Shared_Updater', 'renameHook');
  		}
  	}