Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
olleharstedt committed Jan 18, 2021
2 parents 47b778f + c5ed64b commit d3c3eaa
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions application/controllers/admin/tokens.php
Expand Up @@ -661,9 +661,8 @@ public function addnew($iSurveyId)
);
$validuntil = $datetimeobj->convert('Y-m-d H:i:s');
}
/* @var string : used to find if token already exist */
/** @var string : used to find if token already exist */
$sanitizedtoken = Token::sanitizeToken($request->getPost('token'));

$aData = array(
'firstname' => $request->getPost('firstname'),
'lastname' => $request->getPost('lastname'),
Expand Down

2 comments on commit d3c3eaa

@Shnoulle
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK : don't cherry-pick from master to develop … sorry

@olleharstedt
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No probs here!

Please sign in to comment.