Merge branch 'master' into fixing-3942-master

Conflicts:
	apps/files/ajax/upload.php

diff --cc apps/files/ajax/upload.php
index 0a61ff72d41184df208e2957e5f005f124b46e0a,54604d105631a51a515822c03213c93023f037fb..dde5d3c50af32e032567a812ce1be2465e96b13b
--- 1/apps/files/ajax/upload.php
--- 2/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@@ -27,17 -26,21 +26,18 @@@ if (empty($_POST['dirToken'])) 
        if (!($linkItem['permissions'] & OCP\PERMISSION_CREATE)) {
                OCP\JSON::checkLoggedIn();
        } else {
 +              // resolve reshares
 +              $rootLinkItem = OCP\Share::resolveReShare($linkItem);
 +
                // Setup FS with owner
 -              OC_Util::setupFS($linkItem['uid_owner']);
 -
 -              // translate linkItem to the real folder name on the file system
 -              $sharedItem = OCP\Share::getSharedItem($linkItem['item_type'], $linkItem['item_source'], $linkItem['uid_owner']);
 -              if (!$sharedItem || empty($sharedItem) || $sharedItem === false) {
 -                      OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Unable to set upload directory.')))));
 -                      die();
 -              }
+               OC_Util::tearDownFS();
 +              OC_Util::setupFS($rootLinkItem['uid_owner']);
  
                // The token defines the target directory (security reasons)
 +              $path = \OC\Files\Filesystem::getPath($linkItem['file_source']);
                $dir = sprintf(
                        "/%s/%s",
 -                      $sharedItem['path'],
 +                      $path,
                        isset($_POST['subdir']) ? $_POST['subdir'] : ''
                );
  

diff --cc apps/files_sharing/public.php
Simple merge

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