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

Adapt to new 'db_prefix' mechanism in Roundcube config

Browse source
This commit is contained in:
Thomas Bruederli 2013-07-18 11:46:32 +02:00
parent 1999f79446
commit f030275eb3
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -62,9 +62,10 @@ class database_driver extends calendar_driver
require_once($this->cal->home . '/lib/Horde_Date_Recurrence.php'); require_once($this->cal->home . '/lib/Horde_Date_Recurrence.php');
// read database config // read database config
$this->db_events = $this->rc->config->get('db_table_events', $this->db_events); $db = $this->rc->get_dbh();
$this->db_calendars = $this->rc->config->get('db_table_calendars', $this->db_calendars); $this->db_events = $this->rc->config->get('db_table_events', $db->table_name($this->db_events));
$this->db_attachments = $this->rc->config->get('db_table_attachments', $this->db_attachments); $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(); $this->_read_calendars();
} }

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

@ -46,8 +46,9 @@ class tasklist_database_driver extends tasklist_driver
$this->plugin = $plugin; $this->plugin = $plugin;
// read database config // read database config
$this->db_lists = $this->rc->config->get('db_table_lists', $this->db_lists); $db = $this->rc->get_dbh();
$this->db_tasks = $this->rc->config->get('db_table_tasks', $this->db_tasks); $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(); $this->_read_lists();
} }