Merge branch 'master' into shared-folder-etags

Conflicts:
	apps/files_sharing/lib/sharedstorage.php

diff --cc apps/files_sharing/lib/cache.php
Simple merge

diff --cc apps/files_sharing/lib/share/file.php
Simple merge

diff --cc apps/files_sharing/lib/sharedstorage.php
index 0163f2e00b486c652e81836ed4c130c9271b6f63,5a9864b64bae035873c12cef62d7f8758069883a..19abc8382583e7a5f5b6a8bae2e6b7c4f3d1737b
--- 1/apps/files_sharing/lib/sharedstorage.php
--- 2/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');
                }
        }
  

diff --cc lib/public/share.php
Simple merge