Fix "PHP Fatal error: Cannot redeclare class PEAR" if both program/lib/PEAR.php and composer loaders exist (#1490112)

1 files changed, 5 insertions, 5 deletions

diff --git a/program/include/iniset.php b/program/include/iniset.php
index 981a53d18..a999ea57e 100644
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -54,17 +54,17 @@ 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';