GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Fixed DB_DataObject to return the right keys info for a compound 

key & fix ini output
This commit is contained in:
Zach Copley 2009-11-08 11:17:08 -08:00
parent 8980bebcb3
commit 3209544b30
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/RSSCloud/RSSCloudSubscription.php
View File

@ -40,27 +40,25 @@ class RSSCloudSubscription extends Memcached_DataObject {
function table() function table()
{ {
global $_DB_DATAOBJECT;
$dbtype = $_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5]->dsn['phptype'];
$cols = array( $db = $this->getDatabaseConnection();
'subscribed' => DB_DATAOBJECT_INT, $dbtype = $db->phptype;
'url' => DB_DATAOBJECT_STR,
$cols = array('subscribed' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
'url' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
'failures' => DB_DATAOBJECT_INT, 'failures' => DB_DATAOBJECT_INT,
'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME, 'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL,
'modified' => ($dbtype == 'mysql') ? 'modified' => ($dbtype == 'mysql' || $dbtype == 'mysqli') ?
DB_DATAOBJECT_MYSQLTIMESTAMP : DB_DATAOBJECT_MYSQLTIMESTAMP + DB_DATAOBJECT_NOTNULL :
DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME
); );
// common_debug(var_export($cols, true));
return $cols; return $cols;
} }
function keys() function keys()
{ {
return array('subscribed', 'url'); return array('subscribed' => 'N', 'url' => 'N');
} }
static function getSubscription($subscribed, $url) static function getSubscription($subscribed, $url)