extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

preferring get_rrows over get_rows to fix SQL error in timesheet merge

Browse Source
This commit is contained in:
Ralf Becker 2021-09-13 18:02:39 +02:00
parent 621d69f921
commit be3514c36f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/Storage/Merge.php
View File

@ -2472,8 +2472,8 @@ abstract class Merge
return $ui->get_all_ids();
}
// Try cache
if( method_exists($ui_class, 'get_rows'))
// Try cache, preferring get_rrows over get_rows
if (method_exists($ui_class, $get_rows='get_rrows') || method_exists($ui_class, $get_rows='get_rows'))
{
foreach($locations as $location)
{
@ -2486,7 +2486,7 @@ abstract class Merge
$rows = $readonlys = array();
@set_time_limit(0); // switch off the execution time limit, as it's for big selections to small
$session['num_rows'] = -1; // all
$ui->get_rows($session, $rows, $readonlys);
$ui->$get_rows($session, $rows, $readonlys);
foreach($rows as $row_number => $row)
{
if(!is_numeric($row_number)) continue;