opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update core 8.3.0

Browse source
This commit is contained in:
Rob Davies 2017-04-13 15:53:35 +01:00
parent da7a7918f8
commit cd7a898e66
6144 changed files with 132297 additions and 87747 deletions
Download patch file Download diff file Expand all files Collapse all files

14
web/core/modules/file/src/FileUsage/DatabaseFileUsageBackend.php
View file

@ -44,14 +44,14 @@ class DatabaseFileUsageBackend extends FileUsageBase {
*/
public function add(FileInterface $file, $module, $type, $id, $count = 1) {
$this->connection->merge($this->tableName)
->keys(array(
->keys([
'fid' => $file->id(),
'module' => $module,
'type' => $type,
'id' => $id,
))
->fields(array('count' => $count))
->expression('count', 'count + :count', array(':count' => $count))
])
->fields(['count' => $count])
->expression('count', 'count + :count', [':count' => $count])
->execute();
parent::add($file, $module, $type, $id, $count);
@ -85,7 +85,7 @@ class DatabaseFileUsageBackend extends FileUsageBase {
->condition('type', $type)
->condition('id', $id);
}
$query->expression('count', 'count - :count', array(':count' => $count));
$query->expression('count', 'count - :count', [':count' => $count]);
$query->execute();
}
@ -97,11 +97,11 @@ class DatabaseFileUsageBackend extends FileUsageBase {
*/
public function listUsage(FileInterface $file) {
$result = $this->connection->select($this->tableName, 'f')
->fields('f', array('module', 'type', 'id', 'count'))
->fields('f', ['module', 'type', 'id', 'count'])
->condition('fid', $file->id())
->condition('count', 0, '>')
->execute();
$references = array();
$references = [];
foreach ($result as $usage) {
$references[$usage->module][$usage->type][$usage->id] = $usage->count;
}