mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-08 00:54:50 +01:00
- fixed SQL error in saving holidays
- fixed not shown locales in holiday-admin
This commit is contained in:
parent
84c06483f0
commit
5748d1adb5
@ -45,6 +45,7 @@
|
||||
}
|
||||
$hol_id = $holiday['hol_id'];
|
||||
unset($holiday['hol_id']);
|
||||
unset($holiday['hol_locales']);
|
||||
|
||||
if ($hol_id)
|
||||
{
|
||||
@ -171,7 +172,7 @@
|
||||
$this->db->select($this->table,'DISTINCT hol_locale',$querymethod,__LINE__,__FILE__);
|
||||
while($this->db->next_record())
|
||||
{
|
||||
$locale[] = $this->db->f('locale');
|
||||
$locale[] = $this->db->f('hol_locale');
|
||||
}
|
||||
return $locale;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user