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.

diff --git a/plugins/OpenID/User_openid.php b/plugins/OpenID/User_openid.php
index c24a1ee9a411cb9a7bc30c01ce3acd7926f2676f..801b49eccdcd612b24a891cd4ca2392e7dcfc961 100644 (file)
--- a/plugins/OpenID/User_openid.php
+++ b/plugins/OpenID/User_openid.php
@@ -23,26 +23,28 @@ class User_openid extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    function table() {
+    function table()
+    {
 
-        global $_DB_DATAOBJECT;
-        $dbtype = $_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5]->dsn['phptype'];
+        $db = $this->getDatabaseConnection();
+        $dbtype = $db->phptype; // Database type is stored here. Crazy but true.
 
         return array('canonical' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
                      'display'   => 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('canonical' => 'K', 'display' => 'U');
     }
 
-    static function hasOpenID($user_id)
+    Static function hasOpenID($user_id)
     {
         $oid = new User_openid();
 

diff --git a/plugins/OpenID/User_openid_trustroot.php b/plugins/OpenID/User_openid_trustroot.php
index ecf625ab42d822eaaacef62ffaa582f0f9c97141..44288945be2fcaf3a4bdb908b1fc0da9117df1e3 100644 (file)
--- 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');
     }