From ed8b7fc1019d48741b11dd25e614677a80d0a89f Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Fri, 13 Jun 2014 16:18:21 +0200
Subject: [PATCH] complete renaming uid to userId
---
core/lostpassword/controller/lostcontroller.php | 8 ++++----
core/routes.php | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/core/lostpassword/controller/lostcontroller.php b/core/lostpassword/controller/lostcontroller.php
index db94eeadeac..1cab87432ca 100644
--- a/core/lostpassword/controller/lostcontroller.php
+++ b/core/lostpassword/controller/lostcontroller.php
@@ -57,15 +57,15 @@ class LostController extends Controller {
* @NoCSRFRequired
*
* @param string $token
- * @param string $uid
+ * @param string $userId
*/
- public function resetform($token, $uid) {
+ public function resetform($token, $userId) {
return new TemplateResponse(
'core/lostpassword',
'resetpassword',
array(
'isEncrypted' => $this->isDataEncrypted,
- 'link' => $this->getLink('core.lost.setPassword', $uid, $token),
+ 'link' => $this->getLink('core.lost.setPassword', $userId, $token),
),
'guest'
);
@@ -178,7 +178,7 @@ class LostController extends Controller {
protected function getLink($route, $user, $token){
$parameters = array(
'token' => $token,
- 'uid' => $user
+ 'userId' => $user
);
$link = $this->urlGenerator->linkToRoute($route, $parameters);
diff --git a/core/routes.php b/core/routes.php
index ce0103e3ee7..d08bd105a14 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -11,8 +11,8 @@ use OC\Core\LostPassword\Application;
$application = new Application();
$application->registerRoutes($this, array('routes' => array(
array('name' => 'lost#email', 'url' => '/lostpassword/email', 'verb' => 'POST'),
- array('name' => 'lost#resetform', 'url' => '/lostpassword/reset/form/{token}/{uid}', 'verb' => 'GET'),
- array('name' => 'lost#setPassword', 'url' => '/lostpassword/set/{token}/{uid}', 'verb' => 'POST'),
+ array('name' => 'lost#resetform', 'url' => '/lostpassword/reset/form/{token}/{userId}', 'verb' => 'GET'),
+ array('name' => 'lost#setPassword', 'url' => '/lostpassword/set/{token}/{userId}', 'verb' => 'POST'),
)
));
--
GitLab