projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'xorg/master' into xorg/f/xnet-accounts
[platal.git]
/
modules
/
openid
/
openid.inc.php
diff --git
a/modules/openid/openid.inc.php
b/modules/openid/openid.inc.php
index
09dfe9c
..
f0137a5
100644
(file)
--- a/
modules/openid/openid.inc.php
+++ b/
modules/openid/openid.inc.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-201
0
Polytechnique.org *
+ * Copyright (C) 2003-201
1
Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-138,8
+138,8
@@
class OpenId
{
$res = XDB::query(
"SELECT COUNT(*)
{
$res = XDB::query(
"SELECT COUNT(*)
- FROM
openid_truste
d
- WHERE (u
ser_id = {?} OR user_
id IS NULL) AND url = {?}",
+ FROM
account_auth_openi
d
+ WHERE (u
id = {?} OR u
id IS NULL) AND url = {?}",
$user->id(), $this->request->trust_root);
return ($res->fetchOneCell() > 0);
}
$user->id(), $this->request->trust_root);
return ($res->fetchOneCell() > 0);
}
@@
-151,8
+151,8
@@
class OpenId
$initial_trust = $this->IsEndpointTrusted($user);
if (!$initial_trust && $trusted && $permanent_trust) {
XDB::execute(
$initial_trust = $this->IsEndpointTrusted($user);
if (!$initial_trust && $trusted && $permanent_trust) {
XDB::execute(
- "INSERT IGNORE INTO
openid_truste
d
- SET u
ser_
id = {?}, url = {?}",
+ "INSERT IGNORE INTO
account_auth_openi
d
+ SET uid = {?}, url = {?}",
$user->id(), $this->request->trust_root);
}
$user->id(), $this->request->trust_root);
}