mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-13 17:38:19 +01:00
* Addressbook/Export: fix fatal error regarding order by for postgresql on addressbook export
This commit is contained in:
parent
4759d19d25
commit
c51bf772c8
@ -60,6 +60,7 @@ class addressbook_export_contacts_csv implements importexport_iface_export_plugi
|
|||||||
$query = $GLOBALS['egw']->session->appsession('index','addressbook');
|
$query = $GLOBALS['egw']->session->appsession('index','addressbook');
|
||||||
$query['num_rows'] = -1; // all
|
$query['num_rows'] = -1; // all
|
||||||
$query['csv_export'] = true; // so get_rows method _can_ produce different content or not store state in the session
|
$query['csv_export'] = true; // so get_rows method _can_ produce different content or not store state in the session
|
||||||
|
$query['order'] = 'contact_id';
|
||||||
if(!array_key_exists('filter',$query)) $query['filter'] = $GLOBALS['egw_info']['user']['account_id'];
|
if(!array_key_exists('filter',$query)) $query['filter'] = $GLOBALS['egw_info']['user']['account_id'];
|
||||||
$this->ui->get_rows($query,$selection,$readonlys, true); // only return the ids
|
$this->ui->get_rows($query,$selection,$readonlys, true); // only return the ids
|
||||||
}
|
}
|
||||||
@ -99,7 +100,7 @@ class addressbook_export_contacts_csv implements importexport_iface_export_plugi
|
|||||||
}
|
}
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(strpos($field, '#') !== 0)
|
if(strpos($field, '#') !== 0)
|
||||||
{
|
{
|
||||||
$field = 'contact_'.$field;
|
$field = 'contact_'.$field;
|
||||||
@ -379,7 +380,7 @@ class addressbook_export_contacts_csv implements importexport_iface_export_plugi
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
protected function get_selects()
|
protected function get_selects()
|
||||||
{
|
{
|
||||||
$this->selects = array(
|
$this->selects = array(
|
||||||
|
Loading…
Reference in New Issue
Block a user