summaryrefslogtreecommitdiff
path: root/plugins/OpenID/User_openid_trustroot.php
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/OpenID/User_openid_trustroot.php')
-rw-r--r--plugins/OpenID/User_openid_trustroot.php15
1 files changed, 8 insertions, 7 deletions
diff --git a/plugins/OpenID/User_openid_trustroot.php b/plugins/OpenID/User_openid_trustroot.php
index ecf625ab4..44288945b 100644
--- a/plugins/OpenID/User_openid_trustroot.php
+++ b/plugins/OpenID/User_openid_trustroot.php
@@ -27,21 +27,22 @@ class User_openid_trustroot extends Memcached_DataObject
return Memcached_DataObject::pkeyGet('User_openid_trustroot', $kv);
}
- function table() {
-
- global $_DB_DATAOBJECT;
- $dbtype = $_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5]->dsn['phptype'];
+ function table()
+ {
+ $db = $this->getDatabaseConnection();
+ $dbtype = $db->phptype; // Database type is stored here. Crazy but true.
return array('trustroot' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
'user_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL,
- 'modified' => ($dbtype == 'mysql') ?
- DB_DATAOBJECT_MYSQLTIMESTAMP :
+ 'modified' => ($dbtype == 'mysql' || $dbtype == 'mysqli') ?
+ DB_DATAOBJECT_MYSQLTIMESTAMP + DB_DATAOBJECT_NOTNULL :
DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME
);
}
- function keys() {
+ function keys()
+ {
return array('trustroot' => 'K', 'user_id' => 'K');
}