Aleksander Machniak
2014-10-23 cbac33113a2d706b752675c83e31d8afcfb9be32
Fix "PHP Fatal error: Cannot redeclare class PEAR" if both program/lib/PEAR.php and composer loaders exist (#1490112)
1 files modified
10 ■■■■ changed files
program/include/iniset.php 10 ●●●● patch | view | raw | blame | history
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';