Adapt to new 'db_prefix' mechanism in Roundcube config
This commit is contained in:
parent
1999f79446
commit
f030275eb3
2 changed files with 7 additions and 5 deletions
|
@ -62,9 +62,10 @@ class database_driver extends calendar_driver
|
|||
require_once($this->cal->home . '/lib/Horde_Date_Recurrence.php');
|
||||
|
||||
// read database config
|
||||
$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);
|
||||
$db = $this->rc->get_dbh();
|
||||
$this->db_events = $this->rc->config->get('db_table_events', $db->table_name($this->db_events));
|
||||
$this->db_calendars = $this->rc->config->get('db_table_calendars', $db->table_name($this->db_calendars));
|
||||
$this->db_attachments = $this->rc->config->get('db_table_attachments', $db->table_name($this->db_attachments));
|
||||
|
||||
$this->_read_calendars();
|
||||
}
|
||||
|
|
|
@ -46,8 +46,9 @@ class tasklist_database_driver extends tasklist_driver
|
|||
$this->plugin = $plugin;
|
||||
|
||||
// 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);
|
||||
$db = $this->rc->get_dbh();
|
||||
$this->db_lists = $this->rc->config->get('db_table_lists', $db->table_name($this->db_lists));
|
||||
$this->db_tasks = $this->rc->config->get('db_table_tasks', $db->table_name($this->db_tasks));
|
||||
|
||||
$this->_read_lists();
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue