Execute connection config queries on db handle direclty

11 years ago · 120db629b0
parent aceb0149b8
commit 120db629b0
4 changed files with 4 additions and 4 deletions
--- a/program/lib/Roundcube/rcube_db_mssql.php
+++ b/program/lib/Roundcube/rcube_db_mssql.php
@ -52,7 +52,7 @@ class rcube_db_mssql extends rcube_db
    protected function conn_configure($dsn, $dbh)
    {
        // Set date format in case of non-default language (#1488918)
-        $this->query("SET DATEFORMAT ymd");
+        $dbh->query("SET DATEFORMAT ymd");
    }

    /**
--- a/program/lib/Roundcube/rcube_db_mysql.php
+++ b/program/lib/Roundcube/rcube_db_mysql.php
@ -60,7 +60,7 @@ class rcube_db_mysql extends rcube_db
     */
    protected function conn_configure($dsn, $dbh)
    {
-        $this->query("SET NAMES 'utf8'");
+        $dbh->query("SET NAMES 'utf8'");
    }

    /**
--- a/program/lib/Roundcube/rcube_db_pgsql.php
+++ b/program/lib/Roundcube/rcube_db_pgsql.php
@ -36,7 +36,7 @@ class rcube_db_pgsql extends rcube_db
     */
    protected function conn_configure($dsn, $dbh)
    {
-        $this->query("SET NAMES 'utf8'");
+        $dbh->query("SET NAMES 'utf8'");
    }

    /**
--- a/program/lib/Roundcube/rcube_db_sqlsrv.php
+++ b/program/lib/Roundcube/rcube_db_sqlsrv.php
@ -52,7 +52,7 @@ class rcube_db_sqlsrv extends rcube_db
    protected function conn_configure($dsn, $dbh)
    {
        // Set date format in case of non-default language (#1488918)
-        $this->query("SET DATEFORMAT ymd");
+        $dbh->query("SET DATEFORMAT ymd");
    }

    /**