Commit 1e7d70a4 authored by webchick's avatar webchick
Browse files

#538164 follow-up by yched: Fix notice in update.php.

parent 0d2db0ee
...@@ -287,6 +287,7 @@ function comment_update_7013(&$sandbox) { ...@@ -287,6 +287,7 @@ function comment_update_7013(&$sandbox) {
} }
$sandbox['total'] = count($sandbox['types']); $sandbox['total'] = count($sandbox['types']);
} }
if (!empty($sandbox['types'])) { if (!empty($sandbox['types'])) {
$type = array_shift($sandbox['types']); $type = array_shift($sandbox['types']);
...@@ -307,6 +308,8 @@ function comment_update_7013(&$sandbox) { ...@@ -307,6 +308,8 @@ function comment_update_7013(&$sandbox) {
db_insert($comment_body_table) db_insert($comment_body_table)
->from($query) ->from($query)
->execute(); ->execute();
$sandbox['#finished'] = 1 - count($sandbox['types']) / $sandbox['total'];
} }
// On the last pass of the update, $sandbox['types'] will be empty. // On the last pass of the update, $sandbox['types'] will be empty.
...@@ -314,8 +317,6 @@ function comment_update_7013(&$sandbox) { ...@@ -314,8 +317,6 @@ function comment_update_7013(&$sandbox) {
db_drop_field('comment', 'comment'); db_drop_field('comment', 'comment');
db_drop_field('comment', 'format'); db_drop_field('comment', 'format');
} }
$sandbox['#finished'] = 1 - count($sandbox['types']) / $sandbox['total'];
} }
/** /**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment