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

Merged in bugfix/PMC-325 (pull request #6740)

Browse Source 
PMC-325

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Roly
2019-01-14 14:34:24 +00:00
committed by Julio Cesar Laura Avendaño
parent caeb1d3554 553d6293a9
commit c142260f8e
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]); * Prepend the headers in the resultRow.
//$resultRow[0] = $this->_DBArray[ $tableName ][0]; * If the null value is not taken, $resultRow will lose an element.
*/
/* algorith to order a multiarray $header = null;
// Obtain a list of columns if (isset($this->_DBArray[$tableName][0])) {
foreach ($data as $key => $row) { $header = $this->_DBArray[$tableName][0];
$volume[$key] = $row['volume']; }
$edition[$key] = $row['edition']; array_unshift($resultRow, $header);
}
// 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); */
/* /*
* Apply Limit and Offset * Apply Limit and Offset

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

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