Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#895176 follow-up by Berdir: Don't run the upload module upgrade path if there's nothing to upgrade.

merge-requests/26/head
Angie Byron 2010-10-04 21:58:45 +00:00
parent 933bc80411
commit 4b586bfeca
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/system/system.install
View File

@ -2593,6 +2593,16 @@ function system_update_7060() {
return; return;
} }
if (!db_query_range('SELECT 1 FROM {upload}', 0, 1)->fetchField()) {
// There is nothing to migrate. Delete variables and the empty table. There
// is no need to create fields that are not going to be used.
foreach (_update_7000_node_get_types() as $node_type) {
variable_del('upload_' . $node_type->type);
}
db_drop_table('upload');
return;
}
// Check which node types have upload.module attachments enabled. // Check which node types have upload.module attachments enabled.
$context['types'] = array(); $context['types'] = array();
foreach (_update_7000_node_get_types() as $node_type) { foreach (_update_7000_node_get_types() as $node_type) {