diff options
| author | Sarven Capadisli <csarven@status.net> | 2009-10-30 21:45:22 +0000 |
|---|---|---|
| committer | Sarven Capadisli <csarven@status.net> | 2009-10-30 21:45:22 +0000 |
| commit | a2302e5b76b827f906c5ded028e7c120c6200b76 (patch) | |
| tree | 0c0d3af1c94cfde82074191301870f56624f6b5c /plugins/OpenID/OpenIDPlugin.php | |
| parent | db9aef9f67a9448e73f6ee3463329045e41084f3 (diff) | |
| parent | b7ed31c27bc883b7b7b6a9af6391aacd8d897d78 (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'plugins/OpenID/OpenIDPlugin.php')
| -rw-r--r-- | plugins/OpenID/OpenIDPlugin.php | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php index 5ebee2cbe..2309eea9d 100644 --- a/plugins/OpenID/OpenIDPlugin.php +++ b/plugins/OpenID/OpenIDPlugin.php @@ -150,6 +150,7 @@ class OpenIDPlugin extends Plugin case 'PublicxrdsAction': case 'OpenidsettingsAction': case 'OpenidserverAction': + case 'OpenidtrustAction': require_once(INSTALLDIR.'/plugins/OpenID/' . strtolower(mb_substr($cls, 0, -6)) . '.php'); return false; case 'User_openid': @@ -179,6 +180,7 @@ class OpenIDPlugin extends Plugin { case 'openidlogin': case 'finishopenidlogin': + case 'openidserver': $login = true; return false; default: @@ -286,6 +288,14 @@ class OpenIDPlugin extends Plugin new ColumnDef('created', 'datetime', null, false), new ColumnDef('modified', 'timestamp'))); + $schema->ensureTable('user_openid_trustroot', + array(new ColumnDef('trustroot', 'varchar', + '255', false, 'PRI'), + new ColumnDef('user_id', 'integer', + null, false, 'PRI'), + new ColumnDef('created', 'datetime', + null, false), + new ColumnDef('modified', 'timestamp'))); return true; } } |