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

Issue #3066439 follow-up by alexpott: Stop invoking pre-save methods in EntityStorageInterface::restore() 

(cherry picked from commit 19071a455f)
8.7.x
Alex Pott 2019-07-24 09:14:02 +01:00
parent 2a9176303f
commit dd26473652
No known key found for this signature in database
GPG Key ID: 31905460D4A69276
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/modules/taxonomy/taxonomy.install
View File

@ -213,7 +213,7 @@ function taxonomy_update_8702(&$sandbox) {
// and this used to fix the parent field langcode data.
// - Terms are using a SQL-based storage class.
if (!$field_storage_definition->isTranslatable() &&
!$entity_type->isRevisionable() &&
!$entity_type->isRevisionable() &&
is_subclass_of($entity_type->getStorageClass(), SqlEntityStorageInterface::class)
) {
// taxonomy_update_8502() populated the langcode field of
@ -227,7 +227,8 @@ function taxonomy_update_8702(&$sandbox) {
->condition('tdf.default_langcode', 1);
if (!isset($sandbox['max'])) {
$sandbox['max'] = (clone $select)->countQuery()->execute()->fetchField();
$count_query = clone $select;
$sandbox['max'] = $count_query->countQuery()->execute()->fetchField();
$sandbox['current'] = 0;
}