Merge branch 'master' of github.com:roundcube/roundcubemail

1 files changed, 5 insertions, 0 deletions

diff --git a/program/include/iniset.php b/program/include/iniset.php
index 913d3d7f6..919cc7682 100644
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -60,6 +60,11 @@ 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';