From ce92ba767a9557daf7f18be94882dd7e6f4591fb Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 30 Sep 2010 09:24:33 -0400
Subject: [PATCH] - Plugin API: improved 'abort' flag handling, added 'result' item in some hooks: group_*, contact_*, identity_* (#1486914)
---
program/include/iniset.php | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/program/include/iniset.php b/program/include/iniset.php
index 3887fa5..46a76a4 100755
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -4,8 +4,8 @@
+-----------------------------------------------------------------------+
| program/include/iniset.php |
| |
- | This file is part of the RoundCube Webmail client |
- | Copyright (C) 2008-2009, RoundCube Dev, - Switzerland |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2008-2009, Roundcube Dev, - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -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
);
--
Gitblit v1.9.1