diff options
| -rw-r--r-- | lib/private/Encryption/Util.php | 1 | ||||
| -rw-r--r-- | settings/js/users/users.js | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/private/Encryption/Util.php b/lib/private/Encryption/Util.php index 0e8de5147e1..3afa1bb9596 100644 --- a/lib/private/Encryption/Util.php +++ b/lib/private/Encryption/Util.php @@ -97,6 +97,7 @@ class Util { $this->config = $config; $this->excludedPaths[] = 'files_encryption'; + $this->excludedPaths[] = 'appdata_' . $config->getSystemValue('instanceid', null); } /** diff --git a/settings/js/users/users.js b/settings/js/users/users.js index 71defeaa18a..0e3067db7c7 100644 --- a/settings/js/users/users.js +++ b/settings/js/users/users.js @@ -701,6 +701,7 @@ $(document).ready(function () { // remove highlight class from users without recovery ability $tr.removeClass('row-warning'); }; + blurFunction = _.bind(blurFunction, $input); if(isRestoreDisabled) { $tr.addClass('row-warning'); // add tipsy if the password change could cause data loss - no recovery enabled |