3 files changed, 10 insertions, 2 deletions
diff --git a/program/lib/Roundcube/rcube_db.php b/program/lib/Roundcube/rcube_db.php
index ab7058f2f..2cacb3013 100644
--- a/program/lib/Roundcube/rcube_db.php
+++ b/program/lib/Roundcube/rcube_db.php
@@ -357,7 +357,7 @@ class rcube_db
     public function get_variable($varname, $default = null)
     {
         // to be implemented by driver class
-        return $default;
+        return rcube::get_instance()->config->get('db_' . $varname, $default);
     }
 
     /**
diff --git a/program/lib/Roundcube/rcube_db_mysql.php b/program/lib/Roundcube/rcube_db_mysql.php
index 067e94be6..dd28c25c8 100644
--- a/program/lib/Roundcube/rcube_db_mysql.php
+++ b/program/lib/Roundcube/rcube_db_mysql.php
@@ -167,6 +167,12 @@ class rcube_db_mysql extends rcube_db
             return $this->variables[$varname];
         }
 
+        // configured value has higher prio
+        $conf_value = rcube::get_instance()->config->get('db_' . $varname);
+        if ($conf_value !== null) {
+            return $this->variables[$varname] = $conf_value;
+        }
+
         $result = $this->query('SHOW VARIABLES LIKE ?', $varname);
 
         while ($row = $this->fetch_array($result)) {
diff --git a/program/lib/Roundcube/rcube_db_pgsql.php b/program/lib/Roundcube/rcube_db_pgsql.php
index d33cdd859..ff41df224 100644
--- a/program/lib/Roundcube/rcube_db_pgsql.php
+++ b/program/lib/Roundcube/rcube_db_pgsql.php
@@ -139,9 +139,11 @@ class rcube_db_pgsql extends rcube_db
         // There's a known case when max_allowed_packet is queried
         // PostgreSQL doesn't have such limit, return immediately
         if ($varname == 'max_allowed_packet') {
-            return $default;
+            return rcube::get_instance()->config->get('db_' . $varname, $default);
         }
 
+        $this->variables[$varname] = rcube::get_instance()->config->get('db_' . $varname);
+
         if (!isset($this->variables)) {
             $this->variables = array();