plugins/calendar plugins/tasklist

[Thomas Brüderli]

 plugins/calendar/drivers/database/database_driver.php          |    7 ++++---
 plugins/tasklist/drivers/database/tasklist_database_driver.php |    5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit f030275eb316b307a4e8f28ab3793d2df46bbe90
Author: Thomas Bruederli <thomas at roundcube.net>
Date:   Thu Jul 18 11:46:32 2013 +0200

    Adapt to new 'db_prefix' mechanism in Roundcube config

diff --git a/plugins/calendar/drivers/database/database_driver.php b/plugins/calendar/drivers/database/database_driver.php
index f72f958..c8c54b6 100644
--- a/plugins/calendar/drivers/database/database_driver.php
+++ b/plugins/calendar/drivers/database/database_driver.php
@@ -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();
   }
diff --git a/plugins/tasklist/drivers/database/tasklist_database_driver.php b/plugins/tasklist/drivers/database/tasklist_database_driver.php
index 5c6a0ed..e967427 100644
--- a/plugins/tasklist/drivers/database/tasklist_database_driver.php
+++ b/plugins/tasklist/drivers/database/tasklist_database_driver.php
@@ -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();
     }