diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-22 13:56:16 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-22 13:56:16 -0700 |
| commit | e89908f26140c217e01b2f8f755712f38f3935f3 (patch) | |
| tree | 6b241fc2e33f3528cf48b415ef67906826b02e24 /plugins/OpenID/User_openid_trustroot.php | |
| parent | 714d920faea302b55857cc3bec4e9e6160ea136a (diff) | |
| parent | eb563937df921e5fc67ca0c87e229feb2907fd19 (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
lib/channel.php
scripts/imdaemon.php
Diffstat (limited to 'plugins/OpenID/User_openid_trustroot.php')
| -rw-r--r-- | plugins/OpenID/User_openid_trustroot.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/plugins/OpenID/User_openid_trustroot.php b/plugins/OpenID/User_openid_trustroot.php index 0b411b8f7..17c03afb0 100644 --- a/plugins/OpenID/User_openid_trustroot.php +++ b/plugins/OpenID/User_openid_trustroot.php @@ -43,6 +43,11 @@ class User_openid_trustroot extends Memcached_DataObject function keys() { + return array_keys($this->keyTypes()); + } + + function keyTypes() + { return array('trustroot' => 'K', 'user_id' => 'K'); } |