projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Security update for Core, with self-updated composer
[yaffs-website]
/
web
/
core
/
modules
/
taxonomy
/
src
/
Plugin
/
views
/
filter
/
TaxonomyIndexTidDepth.php
diff --git
a/web/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTidDepth.php
b/web/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTidDepth.php
index 732f5b15011bcfd772e594b9a950000ce0aa8bd5..802786e4674cb82c21147c1c58dbe2a9d7c58ba9 100644
(file)
--- a/
web/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTidDepth.php
+++ b/
web/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTidDepth.php
@@
-2,6
+2,7
@@
namespace Drupal\taxonomy\Plugin\views\filter;
namespace Drupal\taxonomy\Plugin\views\filter;
+use Drupal\Core\Database\Query\Condition;
use Drupal\Core\Form\FormStateInterface;
/**
use Drupal\Core\Form\FormStateInterface;
/**
@@
-54,7
+55,7
@@
class TaxonomyIndexTidDepth extends TaxonomyIndexTid {
$operator = '=';
}
else {
$operator = '=';
}
else {
- $operator = 'IN';
# " IN (" . implode(', ', array_fill(0, sizeof($this->value), '%d')) . ")";
+ $operator = 'IN';
}
// The normal use of ensureMyTable() here breaks Views.
}
// The normal use of ensureMyTable() here breaks Views.
@@
-72,7
+73,7
@@
class TaxonomyIndexTidDepth extends TaxonomyIndexTid {
// Now build the subqueries.
$subquery = db_select('taxonomy_index', 'tn');
$subquery->addField('tn', 'nid');
// Now build the subqueries.
$subquery = db_select('taxonomy_index', 'tn');
$subquery->addField('tn', 'nid');
- $where =
db_or(
)->condition('tn.tid', $this->value, $operator);
+ $where =
(new Condition('OR')
)->condition('tn.tid', $this->value, $operator);
$last = "tn";
if ($this->options['depth'] > 0) {
$last = "tn";
if ($this->options['depth'] > 0) {