From cbac33113a2d706b752675c83e31d8afcfb9be32 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 23 Oct 2014 09:42:19 -0400
Subject: [PATCH] Fix "PHP Fatal error: Cannot redeclare class PEAR" if both program/lib/PEAR.php and composer loaders exist (#1490112)
---
program/include/iniset.php | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/program/include/iniset.php b/program/include/iniset.php
index 981a53d..a999ea5 100644
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -54,16 +54,16 @@
// (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';
--
Gitblit v1.9.1