Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix so insert_id() argument is a table name, not sequence - drop sequence settings

Browse source
This commit is contained in:
Aleksander Machniak 2013-05-07 11:34:45 +02:00
parent de71de2fda
commit 828b868d97
2 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/calendar/drivers/database/database_driver.php
View file

@ -47,9 +47,6 @@ class database_driver extends calendar_driver
private $db_events = 'events';
private $db_calendars = 'calendars';
private $db_attachments = 'attachments';
private $sequence_events = 'event_ids';
private $sequence_calendars = 'calendar_ids';
private $sequence_attachments = 'attachment_ids';
/**
@ -68,9 +65,6 @@ class database_driver extends calendar_driver
$this->db_events = $this->rc->config->get('db_table_events', $this->db_events);
$this->db_calendars = $this->rc->config->get('db_table_calendars', $this->db_calendars);
$this->db_attachments = $this->rc->config->get('db_table_attachments', $this->db_attachments);
$this->sequence_events = $this->rc->config->get('db_sequence_events', $this->sequence_events);
$this->sequence_calendars = $this->rc->config->get('db_sequence_calendars', $this->sequence_calendars);
$this->sequence_attachments = $this->rc->config->get('db_sequence_attachments', $this->sequence_attachments);
$this->_read_calendars();
}
@ -154,7 +148,7 @@ class database_driver extends calendar_driver
);
if ($result)
return $this->rc->db->insert_id($this->sequence_calendars);
return $this->rc->db->insert_id($this->db_calendars);
return false;
}
@ -266,7 +260,7 @@ class database_driver extends calendar_driver
$event['notifyat']
);
$event_id = $this->rc->db->insert_id($this->sequence_events);
$event_id = $this->rc->db->insert_id($this->db_events);
if ($event_id) {
$event['id'] = $event_id;

8
plugins/tasklist/drivers/database/tasklist_database_driver.php
View file

@ -36,8 +36,6 @@ class tasklist_database_driver extends tasklist_driver
private $db_tasks = 'tasks';
private $db_lists = 'tasklists';
private $sequence_tasks = 'task_ids';
private $sequence_lists = 'tasklist_ids';
/**
@ -51,8 +49,6 @@ class tasklist_database_driver extends tasklist_driver
// read database config
$this->db_lists = $this->rc->config->get('db_table_lists', $this->db_lists);
$this->db_tasks = $this->rc->config->get('db_table_tasks', $this->db_tasks);
$this->sequence_lists = $this->rc->config->get('db_sequence_lists', $this->sequence_lists);
$this->sequence_tasks = $this->rc->config->get('db_sequence_tasks', $this->sequence_tasks);
$this->_read_lists();
}
@ -119,7 +115,7 @@ class tasklist_database_driver extends tasklist_driver
);
if ($result)
return $this->rc->db->insert_id($this->sequence_lists);
return $this->rc->db->insert_id($this->db_lists);
return false;
}
@ -528,7 +524,7 @@ class tasklist_database_driver extends tasklist_driver
);
if ($result)
return $this->rc->db->insert_id($this->sequence_tasks);
return $this->rc->db->insert_id($this->db_tasks);
return false;
}