summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-12-14 11:27:46 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2015-12-14 11:27:46 +0100
commit96b28382d940ef2bebd79f95ea218a3503b1a470 (patch)
tree092aff79de0aade2567e6830289d12ff1abc14a9
parent583e696c9ee68dec31bf43a057266cb600de1762 (diff)
parent9d732e35e1a35401ffb7b495b90bf999c5e15e6a (diff)
downloadnextcloud-server-96b28382d940ef2bebd79f95ea218a3503b1a470.tar.gz
nextcloud-server-96b28382d940ef2bebd79f95ea218a3503b1a470.zip
Merge pull request #21148 from owncloud/resetpassword-user-issert
Check if user isset in $_REQUEST first
-rw-r--r--lib/private/util.php8
1 files changed, 5 insertions, 3 deletions
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();
+ }
}
}