Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit 121ae1b3dd76 · 2022-06-10T01:19:17.000-03:00
diff --git a/libraries/classes/Server/Status/Processes.php b/libraries/classes/Server/Status/Processes.php
@@ -28,7 +28,7 @@ public function __construct(DatabaseInterface $dbi)
     /**
      * @param array $params Request parameters
      *
-     * @return array<string, array|string>
+     * @return array<string, array|string|bool>
      */
     public function getList(array $params): array
     {
@@ -97,6 +97,7 @@ public function getList(array $params): array
             'columns' => $this->getSortableColumnsForProcessList($showFullSql, $params),
             'rows' => $rows,
             'refresh_params' => $urlParams,
+            'is_mariadb' => $this->dbi->isMariaDB(),
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public function __construct(DatabaseInterface $dbi)`
`28`	`28`	`/**`
`29`	`29`	`* @param array $params Request parameters`
`30`	`30`	`*`
`31`		`- * @return array<string, array\|string>`
	`31`	`+ * @return array<string, array\|string\|bool>`
`32`	`32`	`*/`
`33`	`33`	`public function getList(array $params): array`
`34`	`34`	`{`
`@@ -97,6 +97,7 @@ public function getList(array $params): array`
`97`	`97`	`'columns' => $this->getSortableColumnsForProcessList($showFullSql, $params),`
`98`	`98`	`'rows' => $rows,`
`99`	`99`	`'refresh_params' => $urlParams,`
	`100`	`+ 'is_mariadb' => $this->dbi->isMariaDB(),`
`100`	`101`	`];`
`101`	`102`	`}`
`102`	`103`