Merge branch 'master' into 1.1.x

[quix0rs-gnu-social.git] / plugins / OpenID / User_openid_trustroot.php

diff --git a/plugins/OpenID/User_openid_trustroot.php b/plugins/OpenID/User_openid_trustroot.php
index 0b411b8f7f11ba9e10cfa932cb58407809dc0f18..eb82115e9518ba05cd58a38bf7e0dde5ca9e0961 100644 (file)
--- a/plugins/OpenID/User_openid_trustroot.php
+++ b/plugins/OpenID/User_openid_trustroot.php
@@ -2,7 +2,10 @@
 /**
  * Table Definition for user_openid_trustroot
  */
-require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
 
 class User_openid_trustroot extends Memcached_DataObject
 {
@@ -43,7 +46,11 @@ class User_openid_trustroot extends Memcached_DataObject
 
     function keys()
     {
-        return array('trustroot' => 'K', 'user_id' => 'K');
+        return array_keys($this->keyTypes());
     }
 
+    function keyTypes()
+    {
+        return array('trustroot' => 'K', 'user_id' => 'K');
+    }
 }