Commit edd72db

committed

fix for #858

1 parent 5a376ab commit edd72dbCopy full SHA for edd72db

File tree

+17

-3

lines changed

+17

-3

lines changed

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7963,7 +7963,11 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface`
`7963`	`7963`	`if (strlen($newPassword) < $passwordLength) {`
`7964`	`7964`	`return $this->responder->error(ErrorCode::PASSWORD_TOO_SHORT, $passwordLength);`
`7965`	`7965`	`}`
`7966`		`- $users = $this->db->selectAll($table, $columnNames, $condition, $columnOrdering, 0, 1);`
	`7966`	`+ $userColumns = $columnNames;`
	`7967`	`+ if(!in_array($pkName, $columnNames)){`
	`7968`	`+ array_push($userColumns, $pkName);`
	`7969`	`+ }`
	`7970`	`+ $users = $this->db->selectAll($table, $userColumns, $condition, $columnOrdering, 0, 1);`
`7967`	`7971`	`foreach ($users as $user) {`
`7968`	`7972`	`if (password_verify($password, $user[$passwordColumnName]) == 1) {`
`7969`	`7973`	`if (!headers_sent()) {`
`@@ -7972,6 +7976,9 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface`
`7972`	`7976`	`$data = [$passwordColumnName => password_hash($newPassword, PASSWORD_DEFAULT)];`
`7973`	`7977`	`$this->db->updateSingle($table, $data, $user[$pkName]);`
`7974`	`7978`	`unset($user[$passwordColumnName]);`
	`7979`	`+ if(!in_array($pkName, $columnNames)){`
	`7980`	`+ unset($user[$pkName]);`
	`7981`	`+ }`
`7975`	`7982`	`return $this->responder->success($user);`
`7976`	`7983`	`}`
`7977`	`7984`	`}`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7963,7 +7963,11 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface`
`7963`	`7963`	`if (strlen($newPassword) < $passwordLength) {`
`7964`	`7964`	`return $this->responder->error(ErrorCode::PASSWORD_TOO_SHORT, $passwordLength);`
`7965`	`7965`	`}`
`7966`		`- $users = $this->db->selectAll($table, $columnNames, $condition, $columnOrdering, 0, 1);`
	`7966`	`+ $userColumns = $columnNames;`
	`7967`	`+ if(!in_array($pkName, $columnNames)){`
	`7968`	`+ array_push($userColumns, $pkName);`
	`7969`	`+ }`
	`7970`	`+ $users = $this->db->selectAll($table, $userColumns, $condition, $columnOrdering, 0, 1);`
`7967`	`7971`	`foreach ($users as $user) {`
`7968`	`7972`	`if (password_verify($password, $user[$passwordColumnName]) == 1) {`
`7969`	`7973`	`if (!headers_sent()) {`
`@@ -7972,6 +7976,9 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface`
`7972`	`7976`	`$data = [$passwordColumnName => password_hash($newPassword, PASSWORD_DEFAULT)];`
`7973`	`7977`	`$this->db->updateSingle($table, $data, $user[$pkName]);`
`7974`	`7978`	`unset($user[$passwordColumnName]);`
	`7979`	`+ if(!in_array($pkName, $columnNames)){`
	`7980`	`+ unset($user[$pkName]);`
	`7981`	`+ }`
`7975`	`7982`	`return $this->responder->success($user);`
`7976`	`7983`	`}`
`7977`	`7984`	`}`

Lines changed: 1 addition & 1 deletion

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Comments

(0)