From c3e441044d07cb89c12fb52b6adc02c4ca4ad2cc Mon Sep 17 00:00:00 2001
From: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
Date: Wed, 11 Feb 2015 09:24:49 -0500
Subject: [PATCH] Allow the timeout and retry interval for memcached servers to be configured
---
program/include/iniset.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/program/include/iniset.php b/program/include/iniset.php
index b2cad42..21afca8 100644
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -55,8 +55,8 @@
@set_time_limit(120);
// include composer autoloader (if available)
-if (@file_exists('vendor/autoload.php')) {
- require 'vendor/autoload.php';
+if (@file_exists(INSTALL_PATH . 'vendor/autoload.php')) {
+ require INSTALL_PATH . 'vendor/autoload.php';
}
// include Roundcube Framework
@@ -68,7 +68,7 @@
// backward compatybility (to be removed)
require_once INSTALL_PATH . 'program/include/bc.php';
-// load the UTF-8 portablity layer from Patchwor
+// load the UTF-8 portablity layer from Patchwork
if (!function_exists('iconv') || !function_exists('utf8_encode') || !extension_loaded('mbstring')) {
\Patchwork\Utf8\Bootup::initAll();
}
--
Gitblit v1.9.1