diff options
| author | Zach Copley <zach@status.net> | 2009-11-25 23:33:13 +0000 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2009-11-25 23:33:13 +0000 |
| commit | bd4a613c380212f58dfd43a5fb5541ac4096fc24 (patch) | |
| tree | a11de855ffb58a6e65be9755693cff7d6106f722 /plugins/UserFlag | |
| parent | 2dc62d21f72e47e715f30446584d7e3af60102c0 (diff) | |
| parent | 035c8cfd719b5efc5df5cc203d68975566b8e976 (diff) | |
Merge branch 'fix-openid' into 0.9.x
Diffstat (limited to 'plugins/UserFlag')
| -rw-r--r-- | plugins/UserFlag/UserFlagPlugin.php | 11 | ||||
| -rw-r--r-- | plugins/UserFlag/User_flag_profile.php | 21 |
2 files changed, 12 insertions, 20 deletions
diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php index c276c4b9f..1a3ef3777 100644 --- a/plugins/UserFlag/UserFlagPlugin.php +++ b/plugins/UserFlag/UserFlagPlugin.php @@ -48,7 +48,16 @@ class UserFlagPlugin extends Plugin $schema = Schema::get(); // For storing user-submitted flags on profiles - $schema->ensureDataObject('User_flag_profile'); + + $schema->ensureTable('user_flag_profile', + array(new ColumnDef('profile_id', 'integer', null, + false, 'PRI'), + new ColumnDef('user_id', 'integer', null, + false, 'PRI'), + new ColumnDef('created', 'datetime', null, + false, 'MUL'), + new ColumnDef('cleared', 'datetime', null, + true, 'MUL'))); return true; } diff --git a/plugins/UserFlag/User_flag_profile.php b/plugins/UserFlag/User_flag_profile.php index 2fb27912d..30bd4ae68 100644 --- a/plugins/UserFlag/User_flag_profile.php +++ b/plugins/UserFlag/User_flag_profile.php @@ -21,9 +21,9 @@ if (!defined('STATUSNET')) { exit(1); } -require_once INSTALLDIR.'/classes/Plugin_DataObject.php'; +require_once INSTALLDIR . '/classes/Memcached_DataObject.php'; -class User_flag_profile extends Plugin_DataObject +class User_flag_profile extends Memcached_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ @@ -65,21 +65,4 @@ class User_flag_profile extends Plugin_DataObject return !empty($ufp); } - - /** - * Get the TableDef object that represents the table backing this class - * @return TableDef TableDef instance - */ - function tableDef() - { - return new TableDef($this->__table, - array(new ColumnDef('profile_id', 'integer', null, - false, 'PRI'), - new ColumnDef('user_id', 'integer', null, - false, 'PRI'), - new ColumnDef('created', 'datetime', null, - false, 'MUL'), - new ColumnDef('cleared', 'datetime', null, - true, 'MUL'))); - } } |