summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcmail.php1
-rw-r--r--program/include/rcube_mdb2.php4
2 files changed, 4 insertions, 1 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index e6e402d19..28ccb0cb0 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -1051,6 +1051,7 @@ class rcmail
return;
$cookie = session_get_cookie_params();
+
setcookie($name, $value, $exp, $cookie['path'], $cookie['domain'],
rcube_https_check(), true);
}
diff --git a/program/include/rcube_mdb2.php b/program/include/rcube_mdb2.php
index 5c945d93c..137ffb273 100644
--- a/program/include/rcube_mdb2.php
+++ b/program/include/rcube_mdb2.php
@@ -106,7 +106,7 @@ class rcube_mdb2
if (!filesize($dsn_array['database']) && !empty($this->sqlite_initials))
$this->_sqlite_create_database($dbh, $this->sqlite_initials);
}
- else if ($this->db_provider!='mssql')
+ else if ($this->db_provider!='mssql' && $this->db_provider!='sqlsrv')
$dbh->setCharset('utf8');
return $dbh;
@@ -467,6 +467,7 @@ class rcube_mdb2
switch($this->db_provider)
{
case 'mssql':
+ case 'sqlsrv':
return "getdate()";
default:
@@ -511,6 +512,7 @@ class rcube_mdb2
break;
case 'mssql':
+ case 'sqlsrv':
return "DATEDIFF(second, '19700101', $field) + DATEDIFF(second, GETDATE(), GETUTCDATE())";
default: