diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2015-05-13 09:41:51 +0300 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2015-05-13 09:41:51 +0300 |
| commit | 6fa4ee8e868eb66c7801c3fd3b43deaabb1b9373 (patch) | |
| tree | 52f655ce35711f3a05839fdad994581dc5a98e0c /core | |
| parent | 485d415ed1a8e0ddf19c4848e5f12b3dd1ca13b6 (diff) | |
| parent | 3b7d285c0a20e4e174bab0dc52536277fd71f9b5 (diff) | |
Merge pull request #15797 from owncloud/stable8-backport-15489
Stable8 backport 15489
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/share.js | 4 | ||||
| -rw-r--r-- | core/templates/login.php | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/core/js/share.js b/core/js/share.js index b3533af4824..128ac729e5d 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -473,6 +473,10 @@ OC.Share={ } else { response(); } + }).fail(function(){ + $('#dropdown').find('.shareWithLoading').addClass('hidden'); + OC.Notification.show(t('core', 'An error occured. Please try again')); + window.setTimeout(OC.Notification.hide, 5000); }); }, focus: function(event, focused) { diff --git a/core/templates/login.php b/core/templates/login.php index f10a8102180..d139f32732c 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -24,6 +24,12 @@ script('core', [ <?php p($message); ?><br> </div> <?php endforeach; ?> + <?php if (isset($_['internalexception']) && ($_['internalexception'])): ?> + <div class="warning"> + <?php p($l->t('An internal error occured.')); ?><br> + <small><?php p($l->t('Please try again or contact your administrator.')); ?></small> + </div> + <?php endif; ?> <p id="message" class="hidden"> <img class="float-spinner" alt="" src="<?php p(\OCP\Util::imagePath('core', 'loading-dark.gif'));?>" /> |