--- activitystream.install +++ (clipboard) @@ -15,11 +15,11 @@ * need to be removed. */ -function activityfeed_install() { +function activitystream_install() { switch ($GLOBALS['db_type']) { case 'mysqli': case 'mysql': - $q1 = db_query("CREATE TABLE IF NOT EXISTS {activitystream_accounts} ( + db_query("CREATE TABLE IF NOT EXISTS {activitystream_accounts} ( uid int(10) unsigned NOT NULL default '0', module varchar(255) default '', userid varchar(255) default '', @@ -27,24 +27,26 @@ feed varchar(255) default '', lastfetch timestamp NOT NULL ) /*!40100 DEFAULT CHARACTER SET utf8 */;"); - $q2 = db_query("CREATE TABLE IF NOT EXISTS {activitystream} ( + db_query("CREATE TABLE IF NOT EXISTS {activitystream} ( nid int(10) unsigned NOT NULL default '0', module varchar(255) default '', + link varchar(255) default '', + data varchar(255) default '', guid varchar(32) default '', PRIMARY KEY (guid) ) /*!40100 DEFAULT CHARACTER SET utf8 */;"); - $q3 = db_query("INSERT INTO {profile_fields} (title, name, explanation, category, type, weight, required, register, visibility, autocomplete, options, page) VALUES ('Placeholder', 'profile_activitystream_placeholder', 'Empty by design. This field simply holds the place so the activitystream category can be added to profiles by a module', 'Activity Stream', 'textfield', -10, 0, 0, 0, 0, null, null)"); + db_query("INSERT INTO {profile_fields} (title, name, explanation, category, type, weight, required, register, visibility, autocomplete, options, page) VALUES ('Placeholder', 'profile_activitystream_placeholder', 'Empty by design. This field simply holds the place so the activitystream category can be added to profiles by a module', 'Activity Stream', 'textfield', -10, 0, 0, 0, 0, null, null)"); break; } - if ($q1 && $q2 && $q3) { - drupal_set_message(t('Activity Stream module installed successfully.' . $warning)); - } - else { - drupal_set_message(t('Table installation for the Activity Stream module was unsuccessful. The tables may need to be installed by hand. See the activitystream.install file for a list of the installation queries.'), 'error'); - } + // if ($q1 && $q2 && $q3) { + // drupal_set_message(t('Activity Stream module installed successfully.' . $warning)); + // } + // else { + // drupal_set_message(t('Table installation for the Activity Stream module was unsuccessful. The tables may need to be installed by hand. See the activitystream.install file for a list of the installation queries.'), 'error'); + // } } -function activityfeed_uninstall() { +function activitystream_uninstall() { if (db_table_exists('activityfeed')) { db_query("DROP TABLE {activityfeed}"); }