diff options
| -rw-r--r-- | core/js/files/client.js | 4 | ||||
| -rw-r--r-- | lib/private/util.php | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/core/js/files/client.js b/core/js/files/client.js index 82cf3ff5121..608c2702fbb 100644 --- a/core/js/files/client.js +++ b/core/js/files/client.js @@ -303,10 +303,6 @@ } break; case 'W': - if (isFile) { - // also add create permissions - data.permissions |= OC.PERMISSION_CREATE; - } data.permissions |= OC.PERMISSION_UPDATE; break; case 'D': diff --git a/lib/private/util.php b/lib/private/util.php index 9016dc59751..578001988d4 100644 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -951,9 +951,11 @@ class OC_Util { $parameters['canResetPassword'] = true; if (!\OC::$server->getSystemConfig()->getValue('lost_password_link')) { - $user = \OC::$server->getUserManager()->get($_REQUEST['user']); - if ($user instanceof IUser) { - $parameters['canResetPassword'] = $user->canChangePassword(); + if (isset($_REQUEST['user'])) { + $user = \OC::$server->getUserManager()->get($_REQUEST['user']); + if ($user instanceof IUser) { + $parameters['canResetPassword'] = $user->canChangePassword(); + } } } |