Merge master into oc_preview

3 files changed, 14 insertions, 22 deletions

diff --git a/apps/files_sharing/l10n/zh_CN.GB2312.php b/apps/files_sharing/l10n/zh_CN.GB2312.php
deleted file mode 100644
index 5c426672c88..00000000000
--- a/apps/files_sharing/l10n/zh_CN.GB2312.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"The password is wrong. Try again." => "密码错误。请重试。",
-"Password" => "密码",
-"Submit" => "提交",
-"Sorry, this link doesn’t seem to work anymore." => "对不起，这个链接看起来是错误的。",
-"Reasons might be:" => "原因可能是:",
-"the item was removed" => "项目已经移除",
-"the link expired" => "链接已过期",
-"sharing is disabled" => "分享已经被禁用",
-"For more info, please ask the person who sent this link." => "欲了解更多信息，请联系将此链接发送给你的人。",
-"%s shared the folder %s with you" => "%s 与您分享了文件夹 %s",
-"%s shared the file %s with you" => "%s 与您分享了文件 %s",
-"Download" => "下载",
-"Upload" => "上传",
-"Cancel upload" => "取消上传",
-"No preview available for" => "没有预览可用于"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/zh_TW.php b/apps/files_sharing/l10n/zh_TW.php
index b950cbf8c9e..56d67ea7ce7 100644
--- a/apps/files_sharing/l10n/zh_TW.php
+++ b/apps/files_sharing/l10n/zh_TW.php
@@ -1,7 +1,14 @@
 <?php
 $TRANSLATIONS = array(
+"The password is wrong. Try again." => "請檢查您的密碼並再試一次。",
 "Password" => "密碼",
 "Submit" => "送出",
+"Sorry, this link doesn’t seem to work anymore." => "抱歉，這連結看來已經不能用了。",
+"Reasons might be:" => "可能的原因：",
+"the item was removed" => "項目已經移除",
+"the link expired" => "連結過期",
+"sharing is disabled" => "分享功能已停用",
+"For more info, please ask the person who sent this link." => "請詢問告訴您此連結的人以瞭解更多",
 "%s shared the folder %s with you" => "%s 和您分享了資料夾 %s ",
 "%s shared the file %s with you" => "%s 和您分享了檔案 %s",
 "Download" => "下載",
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 7384b094cb0..d91acbbb2bd 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -362,9 +362,13 @@ class Shared extends \OC\Files\Storage\Common {
 				case 'xb':
 				case 'a':
 				case 'ab':
-					if (!$this->isUpdatable($path)) {
-						return false;
-					}
+				$exists = $this->file_exists($path);
+				if ($exists && !$this->isUpdatable($path)) {
+					return false;
+				}
+				if (!$exists && !$this->isCreatable(dirname($path))) {
+					return false;
+				}
 			}
 			$info = array(
 				'target' => $this->sharedFolder.$path,