From a98a4f8bb56eacffff1765ff09dd29af26e5fc12 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Wed, 27 Aug 2014 11:45:21 -0400
Subject: [PATCH] Remove 3rd party libs from our repository and define the dependencies in composer.json-dist. Also remove the ancient utf8 lib and replace it with 'Patchwork UTF-8 for PHP'.
---
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 5c30654..b2cad42 100644
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -54,20 +54,25 @@
// (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
--
Gitblit v1.9.1