ElyBy-Mirror/accounts
1
0
Fork 0
mirror of https://github.com/elyby/accounts.git synced 2025-05-31 14:11:46 +05:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into profile

Browse Source
This commit is contained in:
SleepWalker
2016-03-16 08:04:06 +02:00
parent 81d4399bdd 8b1c3a477a
commit e60a4783c1
19 changed files with 427 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/models/Account.php
View File

@@ -183,7 +183,7 @@ class Account extends ActiveRecord implements IdentityInterface {
}
public function getEmailActivations() {
return $this->hasMany(EmailActivation::class, ['id' => 'account_id']);
return $this->hasMany(EmailActivation::class, ['account_id' => 'id']);
}
public function getSessions() {
@@ -200,9 +200,9 @@ class Account extends ActiveRecord implements IdentityInterface {
* @return bool
*/
public function canAutoApprove(OauthClient $client, array $scopes = []) {
//if ($client->is_trusted) {
// return true;
//}
if ($client->is_trusted) {
return true;
}
/** @var OauthSession|null $session */
$session = $this->getSessions()->andWhere(['client_id' => $client->id])->one();