mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-23 07:09:20 +01:00
preferring get_rrows over get_rows to fix SQL error in timesheet merge
This commit is contained in:
parent
621d69f921
commit
be3514c36f
@ -2472,8 +2472,8 @@ abstract class Merge
|
|||||||
return $ui->get_all_ids();
|
return $ui->get_all_ids();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Try cache
|
// Try cache, preferring get_rrows over get_rows
|
||||||
if( method_exists($ui_class, 'get_rows'))
|
if (method_exists($ui_class, $get_rows='get_rrows') || method_exists($ui_class, $get_rows='get_rows'))
|
||||||
{
|
{
|
||||||
foreach($locations as $location)
|
foreach($locations as $location)
|
||||||
{
|
{
|
||||||
@ -2486,7 +2486,7 @@ abstract class Merge
|
|||||||
$rows = $readonlys = array();
|
$rows = $readonlys = array();
|
||||||
@set_time_limit(0); // switch off the execution time limit, as it's for big selections to small
|
@set_time_limit(0); // switch off the execution time limit, as it's for big selections to small
|
||||||
$session['num_rows'] = -1; // all
|
$session['num_rows'] = -1; // all
|
||||||
$ui->get_rows($session, $rows, $readonlys);
|
$ui->$get_rows($session, $rows, $readonlys);
|
||||||
foreach($rows as $row_number => $row)
|
foreach($rows as $row_number => $row)
|
||||||
{
|
{
|
||||||
if(!is_numeric($row_number)) continue;
|
if(!is_numeric($row_number)) continue;
|
||||||
|
Loading…
Reference in New Issue
Block a user