From b0eeaac9e01b602b76e4e199a061351888a13cbe Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 05 Aug 2010 03:14:08 -0400
Subject: [PATCH] - Fix: rcube_user::get_username() doesn't take mail_domain setting into account (#1486895)
---
program/include/iniset.php | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/program/include/iniset.php b/program/include/iniset.php
index 29b2cce..2a30e51 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));
@@ -62,7 +62,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 +74,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 +91,6 @@
'/Net_(.+)/',
'/^html_.+/',
'/^utf8$/',
- '/html2text/'
),
array(
'MDB2/\\1',
@@ -99,7 +98,6 @@
'Net/\\1',
'html',
'utf8.class',
- 'lib/html2text' // see #1485505
),
$classname
);
@@ -123,6 +121,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