dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fixed a bug with multi-character select (session mixed up)

Browse Source 
- removed "beta" status from /admin login
- changed "tooltip" default color "green" -> "gray"
This commit is contained in:
Mark Friedrich
2017-12-08 20:33:55 +01:00
parent 7a8c270dfe
commit 3bf98ed0f3
16 changed files with 249 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/main/controller/api/user.php
View File

@@ -42,11 +42,10 @@ class User extends Controller\Controller{
/**
* login a valid character
* @param Model\CharacterModel $characterModel
* @param string $browserTabId
* @return bool
* @throws Exception
*/
protected function loginByCharacter(Model\CharacterModel &$characterModel, string $browserTabId){
protected function loginByCharacter(Model\CharacterModel &$characterModel){
$login = false;
if($user = $characterModel->getUser()){
@@ -97,7 +96,7 @@ class User extends Controller\Controller{
// set temp character data ------------------------------------------------------------
// -> pass character data over for next http request (reroute())
$this->setTempCharacterData($characterModel->_id, $browserTabId);
$this->setTempCharacterData($characterModel->_id);
$login = true;
}