diff options
Diffstat (limited to 'program/include/iniset.php')
| -rw-r--r-- | program/include/iniset.php | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/program/include/iniset.php b/program/include/iniset.php index 5c3065489..b2cad4292 100644 --- a/program/include/iniset.php +++ b/program/include/iniset.php @@ -54,20 +54,25 @@ if (set_include_path($include_path) === false) { // (does not work in safe mode) @set_time_limit(120); +// include composer autoloader (if available) +if (@file_exists('vendor/autoload.php')) { + require 'vendor/autoload.php'; +} + // include Roundcube Framework require_once 'Roundcube/bootstrap.php'; // register autoloader for rcmail app classes spl_autoload_register('rcmail_autoload'); -// include composer autoloader (if available) -if (@file_exists('vendor/autoload.php')) { - require 'vendor/autoload.php'; -} - // backward compatybility (to be removed) require_once INSTALL_PATH . 'program/include/bc.php'; +// load the UTF-8 portablity layer from Patchwor +if (!function_exists('iconv') || !function_exists('utf8_encode') || !extension_loaded('mbstring')) { + \Patchwork\Utf8\Bootup::initAll(); +} + /** * PHP5 autoloader routine for dynamic class loading |