From cb2bc809ef29f349d38c89e202d821e67bb4c947 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 21 Sep 2010 14:47:55 -0400
Subject: [PATCH] Fix db_mode check in insert_id()
---
program/include/iniset.php | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/program/include/iniset.php b/program/include/iniset.php
index 29b2cce..a4f87e9 100755
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -36,7 +36,7 @@
}
// application constants
-define('RCMAIL_VERSION', '0.3-trunk');
+define('RCMAIL_VERSION', '0.4-trunk');
define('RCMAIL_CHARSET', 'UTF-8');
define('JS_OBJECT_NAME', 'rcmail');
define('RCMAIL_START', microtime(true));
@@ -45,7 +45,9 @@
define('INSTALL_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/');
}
-define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
+if (!defined('RCMAIL_CONFIG_DIR')) {
+ define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
+}
// make sure path_separator is defined
if (!defined('PATH_SEPARATOR')) {
@@ -62,7 +64,7 @@
$include_path.= ini_get('include_path');
if (set_include_path($include_path) === false) {
- die('Fatal error: ini_set/set_include_path does not work.');
+ die("Fatal error: ini_set/set_include_path does not work.");
}
ini_set('error_reporting', E_ALL&~E_NOTICE);
@@ -74,7 +76,7 @@
// set internal encoding for mbstring extension
if(extension_loaded('mbstring'))
mb_internal_encoding(RCMAIL_CHARSET);
-
+
/**
* Use PHP5 autoload for dynamic class loading
@@ -91,7 +93,6 @@
'/Net_(.+)/',
'/^html_.+/',
'/^utf8$/',
- '/html2text/'
),
array(
'MDB2/\\1',
@@ -99,7 +100,6 @@
'Net/\\1',
'html',
'utf8.class',
- 'lib/html2text' // see #1485505
),
$classname
);
@@ -123,6 +123,5 @@
PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'rcube_pear_error');
// include global functions
-require_once 'include/bugs.inc';
require_once 'include/main.inc';
require_once 'include/rcube_shared.inc';
--
Gitblit v1.9.1