harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some more snakebite and fix up include/account - forgot about that inline array stuff

Browse Source
This commit is contained in:
friendica
2014-02-18 16:59:31 -08:00
parent 7d4916ec71
commit 5747e20e50
4 changed files with 57 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/account.php
View File

@@ -440,7 +440,8 @@ function downgrade_accounts() {
dbesc('0000-00-00 00:00:00'),
intval($rr['account_id'])
);
call_hooks('account_downgrade', array('account' => $rr));
$ret = array('account' => $rr);
call_hooks('account_downgrade', $ret );
logger('downgrade_accounts: Account id ' . $rr['account_id'] . ' downgraded.');
}
else {
@@ -448,8 +449,10 @@ function downgrade_accounts() {
intval(ACCOUNT_EXPIRED),
intval($rr['account_id'])
);
call_hooks('account_downgrade', array('account' => $rr));
$ret = array('account' => $rr);
call_hooks('account_downgrade', $ret);
logger('downgrade_accounts: Account id ' . $rr['account_id'] . ' expired.');
}
}
}
}

8
include/auth.php
View File

@@ -233,10 +233,10 @@ else {
function match_openid($authid) {
$r = q("select * from pconfig where cat = 'system' and k = 'openid' ");
$r = q("select * from pconfig where cat = 'system' and k = 'openid' and v = '%s' limit 1",
dbesc($authid)
);
if($r)
foreach($r as $rr)
if($rr['v'] === $authid)
return $rr['uid'];
return $r[0]['uid'];
return false;
}