diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-04-21 12:47:43 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-04-21 12:47:43 +0200 |
| commit | 4b968da9e64c4bfbdd166caaff4fab9bfc47a182 (patch) | |
| tree | b00eae846df6397eec0ad5fad77b45dff0286c50 /settings | |
| parent | b0fcf0fa0ee8846e2ba35ede5968ed0227c5675d (diff) | |
| parent | 490e779424178977c143eba94a139f249eb2416f (diff) | |
| download | nextcloud-server-4b968da9e64c4bfbdd166caaff4fab9bfc47a182.tar.gz nextcloud-server-4b968da9e64c4bfbdd166caaff4fab9bfc47a182.zip | |
Merge pull request #15713 from owncloud/fix-15707-master
[enc2] Fixing JS errors
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/js/personal.js | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/settings/js/personal.js b/settings/js/personal.js index 165b55bcdae..f3fcf614bfa 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -330,8 +330,9 @@ $(document).ready(function () { $('#sslCertificate tbody').append(row); }, - fail: function (e, data) { - OC.Notification.showTemporary(t('settings', 'An error occured. Please upload an ASCII-encoded PEM certificate.')); + fail: function () { + OC.Notification.showTemporary( + t('settings', 'An error occurred. Please upload an ASCII-encoded PEM certificate.')); } }); @@ -340,8 +341,9 @@ $(document).ready(function () { }); }); -OC.Encryption = { -}; +if (!OC.Encryption) { + OC.Encryption = {}; +} OC.Encryption.msg = { start: function (selector, msg) { |