Skip to content

Commit

Permalink
fixes (#96)
Browse files Browse the repository at this point in the history
* moved Docs

* Merge branch 'master' of https://github.com/Alpha-Trader/AlphaTraderApiBundle into Alpha-Trader-master

# Conflicts:
#	Doc/LICENSE
#	README.md
#	meta/LICENSE
#	src/Resources/meta/LICENSE

* added possibility to set api url during runtime

* channel specifiy getunreadchat

* fix

* fix
  • Loading branch information
Tr0nYx committed Nov 3, 2016
1 parent 5245924 commit 1330f91
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/Api/AlphaTrader.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ public function __construct($config, SessionInterface $session = null, $jwt = nu
{
$this->config = $config;
$this->jwt = $jwt ?: $config['jwt'];
if ($session !== null) {
$this->jwt = $session->get('_attoken') ? : $jwt;
if ($session->isStarted()) {
$this->jwt = $session->get('_attoken') ?: $jwt;
}
}

Expand Down

0 comments on commit 1330f91

Please sign in to comment.