Skip to content
Snippets Groups Projects
Commit ed8b7fc1 authored by Morris Jobke's avatar Morris Jobke
Browse files

complete renaming uid to userId

parent ebbf2283
No related branches found
No related tags found
No related merge requests found
...@@ -57,15 +57,15 @@ class LostController extends Controller { ...@@ -57,15 +57,15 @@ class LostController extends Controller {
* @NoCSRFRequired * @NoCSRFRequired
* *
* @param string $token * @param string $token
* @param string $uid * @param string $userId
*/ */
public function resetform($token, $uid) { public function resetform($token, $userId) {
return new TemplateResponse( return new TemplateResponse(
'core/lostpassword', 'core/lostpassword',
'resetpassword', 'resetpassword',
array( array(
'isEncrypted' => $this->isDataEncrypted, 'isEncrypted' => $this->isDataEncrypted,
'link' => $this->getLink('core.lost.setPassword', $uid, $token), 'link' => $this->getLink('core.lost.setPassword', $userId, $token),
), ),
'guest' 'guest'
); );
...@@ -178,7 +178,7 @@ class LostController extends Controller { ...@@ -178,7 +178,7 @@ class LostController extends Controller {
protected function getLink($route, $user, $token){ protected function getLink($route, $user, $token){
$parameters = array( $parameters = array(
'token' => $token, 'token' => $token,
'uid' => $user 'userId' => $user
); );
$link = $this->urlGenerator->linkToRoute($route, $parameters); $link = $this->urlGenerator->linkToRoute($route, $parameters);
......
...@@ -11,8 +11,8 @@ use OC\Core\LostPassword\Application; ...@@ -11,8 +11,8 @@ use OC\Core\LostPassword\Application;
$application = new Application(); $application = new Application();
$application->registerRoutes($this, array('routes' => array( $application->registerRoutes($this, array('routes' => array(
array('name' => 'lost#email', 'url' => '/lostpassword/email', 'verb' => 'POST'), array('name' => 'lost#email', 'url' => '/lostpassword/email', 'verb' => 'POST'),
array('name' => 'lost#resetform', 'url' => '/lostpassword/reset/form/{token}/{uid}', 'verb' => 'GET'), array('name' => 'lost#resetform', 'url' => '/lostpassword/reset/form/{token}/{userId}', 'verb' => 'GET'),
array('name' => 'lost#setPassword', 'url' => '/lostpassword/set/{token}/{uid}', 'verb' => 'POST'), array('name' => 'lost#setPassword', 'url' => '/lostpassword/set/{token}/{userId}', 'verb' => 'POST'),
) )
)); ));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment