projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated to Drupal 8.6.4, which is PHP 7.3 friendly. Also updated HTMLaw library....
[yaffs-website]
/
web
/
core
/
lib
/
Drupal
/
Core
/
Entity
/
Query
/
Sql
/
QueryAggregate.php
diff --git
a/web/core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php
b/web/core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php
index 2d2aacfdf326e5c527be26e19b07208527beb2d1..f865cf76ef8138d8446bc8c0d45683752c3aa602 100644
(file)
--- a/
web/core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php
+++ b/
web/core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php
@@
-65,7
+65,6
@@
class QueryAggregate extends Query implements QueryAggregateInterface {
return $this->conditionAggregate->notExists($field, $function, $langcode);
}
return $this->conditionAggregate->notExists($field, $function, $langcode);
}
-
/**
* Adds the aggregations to the query.
*
/**
* Adds the aggregations to the query.
*
@@
-126,7
+125,6
@@
class QueryAggregate extends Query implements QueryAggregateInterface {
return $this;
}
return $this;
}
-
/**
* Overrides \Drupal\Core\Entity\Query\Sql\Query::finish().
*
/**
* Overrides \Drupal\Core\Entity\Query\Sql\Query::finish().
*
@@
-172,7
+170,7
@@
class QueryAggregate extends Query implements QueryAggregateInterface {
}
$return = [];
foreach ($this->sqlQuery->execute() as $row) {
}
$return = [];
foreach ($this->sqlQuery->execute() as $row) {
- $return[] = (array)$row;
+ $return[] = (array)
$row;
}
return $return;
}
}
return $return;
}