From e7674361762f964ddfacb1c28741db58472d611a Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 26 Nov 2009 02:21:23 +0000 Subject: Some changes to the OpenID DataObjects to make them emit the exact same .ini info as what used to be in statusnet.ini before OpenID was pulled out into a plugin. --- plugins/OpenID/User_openid_trustroot.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'plugins/OpenID/User_openid_trustroot.php') 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'); } -- cgit v1.2.3-54-g00ecf