updated core to 8.6.3

2018-11-21 12:49:46 +01:00
parent 8ca34853a3
commit c92c348eee
521 changed files with 12199 additions and 4578 deletions
@@ -32,7 +32,12 @@ function taxonomy_update_8502(&$sandbox) {
    $sandbox['tid'] = -1;
    $sandbox['delta'] = 0;
    $sandbox['limit'] = Settings::get('entity_update_batch_size', 50);
-    $sandbox['max'] = $database->select('taxonomy_term_hierarchy')
+
+    // Count records using a join, as there might be orphans in the hierarchy
+    // table. See https://www.drupal.org/project/drupal/issues/2997982.
+    $select = $database->select('taxonomy_term_hierarchy', 'h');
+    $select->join('taxonomy_term_data', 'd', 'h.tid = d.tid');
+    $sandbox['max'] = $select
      ->countQuery()
      ->execute()
      ->fetchField();