Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / web / modules / contrib / devel / webprofiler / src / DataCollector / DatabaseDataCollector.php

diff --git a/web/modules/contrib/devel/webprofiler/src/DataCollector/DatabaseDataCollector.php b/web/modules/contrib/devel/webprofiler/src/DataCollector/DatabaseDataCollector.php
index bdcf49ceb947ee9141725c34e0192fb4ef712b87..2c766a4150562b473dde34c6eef08e3b237a511e 100644 (file)
--- a/web/modules/contrib/devel/webprofiler/src/DataCollector/DatabaseDataCollector.php
+++ b/web/modules/contrib/devel/webprofiler/src/DataCollector/DatabaseDataCollector.php
@@ -56,7 +56,7 @@ class DatabaseDataCollector extends DataCollector implements DrupalDataCollector
         unset($query['caller']['args']);
 
         // Remove query args element if empty.
-        if (empty($query['args'])) {
+        if (isset($query['args']) && empty($query['args'])) {
           unset($query['args']);
         }
 
@@ -223,8 +223,11 @@ class DatabaseDataCollector extends DataCollector implements DrupalDataCollector
       $query['type'] = $type;
 
       $quoted = [];
-      foreach ((array) $query['args'] as $key => $val) {
-        $quoted[$key] = is_null($val) ? 'NULL' : $conn->quote($val);
+
+      if (isset($query['args'])) {
+        foreach ((array) $query['args'] as $key => $val) {
+          $quoted[$key] = is_null($val) ? 'NULL' : $conn->quote($val);
+        }
       }
 
       $query['query_args'] = strtr($query['query'], $quoted);