[Pkg-owncloud-commits] [owncloud] 247/273: only show message if default expire date is enforced

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 79e54994f9c7cb43f1a89cd9d95f053eff7df1f7
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Thu Jul 3 10:52:27 2014 +0200

    only show message if default expire date is enforced
---
 core/js/share.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/core/js/share.js b/core/js/share.js
index 62271a4..9af86c7 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -342,12 +342,8 @@ OC.Share={
 				html += '<br />';
 
 				var defaultExpireMessage = '';
-				if ((itemType === 'folder' || itemType === 'file') && oc_appconfig.core.defaultExpireDateEnabled) {
-					if (oc_appconfig.core.defaultExpireDateEnforced) {
-						defaultExpireMessage = t('core', 'The public link will expire no later than {days} days after it is created',  {'days': escapeHTML(oc_appconfig.core.defaultExpireDate)}) + '<br/>';
-					} else {
-						defaultExpireMessage = t('core', 'By default the public link will expire after {days} days', {'days': escapeHTML(oc_appconfig.core.defaultExpireDate)}) + '<br/>';
-					}
+				if ((itemType === 'folder' || itemType === 'file') && oc_appconfig.core.defaultExpireDateEnforced) {
+					defaultExpireMessage = t('core', 'The public link will expire no later than {days} days after it is created',  {'days': escapeHTML(oc_appconfig.core.defaultExpireDate)}) + '<br/>';
 				}
 
 				html += '<input id="linkText" type="text" readonly="readonly" />';

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git