From dec9e85eaebaeaca92fbcb8bc581e6756b1c608f Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 03 Aug 2009 07:33:53 -0400
Subject: [PATCH] - Fix rcube_mdb2.php: call to setCharset not implemented in mssql driver (#1486019)
---
program/include/rcube_config.php | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index da6c094..b30cf2d 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -134,8 +134,8 @@
*/
public function load_from_file($fpath)
{
- if (is_file($fpath)) {
- @include($fpath);
+ if (is_file($fpath) && is_readable($fpath)) {
+ include($fpath);
if (is_array($rcmail_config)) {
$this->prop = array_merge($this->prop, $rcmail_config);
return true;
@@ -237,9 +237,9 @@
// use the configured delimiter for headers
if (!empty($this->prop['mail_header_delimiter']))
return $this->prop['mail_header_delimiter'];
- else if (strtolower(substr(PHP_OS, 0, 3) == 'win'))
+ else if (strtolower(substr(PHP_OS, 0, 3)) == 'win')
return "\r\n";
- else if (strtolower(substr(PHP_OS, 0, 3) == 'mac'))
+ else if (strtolower(substr(PHP_OS, 0, 3)) == 'mac')
return "\r\n";
else
return "\n";
--
Gitblit v1.9.1