Security update for Core, with self-updated composer

[yaffs-website] / web / core / modules / taxonomy / src / Plugin / views / argument / IndexTidDepth.php

diff --git a/web/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepth.php b/web/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepth.php
index 6933e745610afc7965cb74264eebf94c7b969662..02b599542608bf587f732172f4d72becc3169a53 100644 (file)
--- a/web/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepth.php
+++ b/web/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepth.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\taxonomy\Plugin\views\argument;
 
+use Drupal\Core\Database\Query\Condition;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
@@ -21,7 +22,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 class IndexTidDepth extends ArgumentPluginBase implements ContainerFactoryPluginInterface {
 
   /**
-   * @var EntityStorageInterface
+   * @var \Drupal\Core\Entity\EntityStorageInterface
    */
   protected $termStorage;
 
@@ -106,7 +107,7 @@ class IndexTidDepth extends ArgumentPluginBase implements ContainerFactoryPlugin
     // Now build the subqueries.
     $subquery = db_select('taxonomy_index', 'tn');
     $subquery->addField('tn', 'nid');
-    $where = db_or()->condition('tn.tid', $tids, $operator);
+    $where = (new Condition('OR'))->condition('tn.tid', $tids, $operator);
     $last = "tn";
 
     if ($this->options['depth'] > 0) {