merged branch willdurand/propel-autoload (PR #4025)

Commits
-------

496878c [Propel1] Removed useless require in autoload.php.dist

Discussion
----------

[Propel1] Removed useless require in autoload.php.dist

Since we have Composer, and a classmap, no need to trigger the Propel's autoloader
This commit is contained in:
Fabien Potencier 2012-04-20 10:00:20 +02:00
commit f8407dd2cc

View File

@ -20,7 +20,3 @@ if (is_file(__DIR__.'/vendor/swiftmailer/swiftmailer/lib/classes/Swift.php')) {
require_once __DIR__.'/vendor/swiftmailer/swiftmailer/lib/classes/Swift.php';
Swift::registerAutoload(__DIR__.'/vendor/swiftmailer/swiftmailer/lib/swift_init.php');
}
if (is_file($file = __DIR__.'/vendor/propel/propel1/runtime/lib/Propel.php')) {
require_once $file;
}