fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PMC-325

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2019-01-11 10:08:45 -04:00
parent 3696005d0d
commit 553d6293a9
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
thirdparty/creole/contrib/DBArrayConnection.php vendored
View File

@@ -523,19 +523,15 @@ class DBArrayConnection implements Connection
}
}
//prepend the headers in the resultRow
array_unshift($resultRow, $this->_DBArray[$tableName][0]);
//$resultRow[0] = $this->_DBArray[ $tableName ][0];
/* algorith to order a multiarray
// Obtain a list of columns
foreach ($data as $key => $row) {
$volume[$key] = $row['volume'];
$edition[$key] = $row['edition'];
}
// Sort the data with volume descending, edition ascending
// Add $data as the last parameter, to sort by the common key
array_multisort($volume, SORT_DESC, $edition, SORT_ASC, $data); */
/**
* Prepend the headers in the resultRow.
* If the null value is not taken, $resultRow will lose an element.
*/
$header = null;
if (isset($this->_DBArray[$tableName][0])) {
$header = $this->_DBArray[$tableName][0];
}
array_unshift($resultRow, $header);
/*
* Apply Limit and Offset

2
workflow/engine/classes/DbConnections.php
View File

@@ -194,7 +194,7 @@ class DbConnections
$conf = Propel::getConfiguration();
// Iterate through the datasources of configuration, and only care about workflow, rbac or rp. Remove anything else.
foreach ($conf['datasources'] as $key => $val) {
if (!in_array($key, ['workflow', 'rbac', 'rp'])) {
if (!in_array($key, ['workflow', 'rbac', 'rp', 'dbarray'])) {
unset($conf['datasources'][$key]);
}
}