diff --git a/core/js/share.js b/core/js/share.js
index 778a9f8e20..ced1e0aa8c 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -163,10 +163,10 @@ OC.Share={
var allowPublicUploadStatus = false;
$.each(data.shares, function(key, value) {
- if (allowPublicUploadStatus) {
- return true;
- }
- allowPublicUploadStatus = (value.permissions & OC.PERMISSION_CREATE) ? true : false;
+ if (allowPublicUploadStatus) {
+ return true;
+ }
+ allowPublicUploadStatus = (value.permissions & OC.PERMISSION_CREATE) ? true : false;
});
html += '';
@@ -181,7 +181,7 @@ OC.Share={
html += '
';
html += '';
html += '
';
- if (itemType == 'folder') {
+ if (itemType == 'folder' && (possiblePermissions & OC.PERMISSION_CREATE)) {
html += '';
html += '
';
html += '
';
diff --git a/core/templates/altmail.php b/core/templates/altmail.php
index 37dc8eee94..a7df29a244 100644
--- a/core/templates/altmail.php
+++ b/core/templates/altmail.php
@@ -1,9 +1,9 @@
t("Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!", array($_['user_displayname'], $_['filename'], $_['link'])));
?>
--
-ownCloud - t("web services under your control"));
-?>
-http://ownCloud.org
+getName() . ' - ' . $defaults->getSlogan()); ?>
+getBaseUrl());
diff --git a/core/templates/mail.php b/core/templates/mail.php
index ebeefd5c7e..562ad82e95 100644
--- a/core/templates/mail.php
+++ b/core/templates/mail.php
@@ -1,3 +1,4 @@
+
@@ -20,10 +21,9 @@ print_unescaped($l->t('Hey there,
just letting you know that %s shared ยป
|
--
-ownCloud - t('web services under your control'));
-?>
- http://ownCloud.org |
+getName()); ?> -
+getSlogan()); ?>
+ getBaseUrl());?>
|
|