diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-06-21 00:00:38 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-06-21 00:00:38 +0000 |
| commit | 3cca50da4495b15f7454f55fefc19d917759d038 (patch) | |
| tree | 4b972f085559be8bd600f73f8517ae7eeb52a1d5 /modules/system/system.install | |
| parent | 2cca6c575488f25d37bdcdd984cc4e960776d45a (diff) | |
| download | brdo-3cca50da4495b15f7454f55fefc19d917759d038.tar.gz brdo-3cca50da4495b15f7454f55fefc19d917759d038.tar.bz2 | |
#817216 by ctmattice1, chx, Stevel, Damien Tournoud: Fixed system_update_7008 does not work, deal with invalid poll choices, and move poll-related upgrade logic to Poll module.
Diffstat (limited to 'modules/system/system.install')
| -rw-r--r-- | modules/system/system.install | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/modules/system/system.install b/modules/system/system.install index ea5f62ab2..6c44e0c43 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -1794,18 +1794,7 @@ function system_update_7007() { * the choice order. Rename chorder to weight. */ function system_update_7008() { - if (db_table_exists('poll_votes')) { - // Add chid column and convert existing votes. - db_add_field('poll_votes', 'chid', array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0)); - db_add_index('poll_votes', 'chid', array('chid')); - db_query("UPDATE {poll_votes} SET chid = (SELECT chid FROM {poll_choices} c WHERE {poll_votes}.chorder = c.chorder AND {poll_votes}.nid = c.nid)"); - // Remove old chorder column. - db_drop_field('poll_votes', 'chorder'); - } - if (db_table_exists('poll_choices')) { - // Change the chorder column to weight in poll_choices. - db_change_field('poll_choices', 'chorder', 'weight', array('type' => 'int', 'not null' => TRUE, 'default' => 0, 'size' => 'tiny')); - } + // Moved to poll_update_7001(). } /** |