only show message if default expire date is enforced

diff --git a/core/js/share.js b/core/js/share.js
index 62271a43ceb8857f7ab19c0b9402e49d83d6f590..9af86c7e19683dc3a6d26ee11e21c5c746311977 100644 (file)
--- 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" />';