Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / web / core / lib / Drupal / Core / Database / Driver / mysql / Upsert.php

diff --git a/web/core/lib/Drupal/Core/Database/Driver/mysql/Upsert.php b/web/core/lib/Drupal/Core/Database/Driver/mysql/Upsert.php
index 6c1af1e812a6641ffaa2098c8477c38514aead2f..8eda775c0a7469da1cd9084b79fa6b3fa02da056 100644 (file)
--- a/web/core/lib/Drupal/Core/Database/Driver/mysql/Upsert.php
+++ b/web/core/lib/Drupal/Core/Database/Driver/mysql/Upsert.php
@@ -18,6 +18,9 @@ class Upsert extends QueryUpsert {
 
     // Default fields are always placed first for consistency.
     $insert_fields = array_merge($this->defaultFields, $this->insertFields);
+    $insert_fields = array_map(function ($field) {
+      return $this->connection->escapeField($field);
+    }, $insert_fields);
 
     $query = $comments . 'INSERT INTO {' . $this->table . '} (' . implode(', ', $insert_fields) . ') VALUES ';