diff options
| author | Joseph Warner <hardolaf@gmail.com> | 2012-05-13 13:05:20 -0400 |
|---|---|---|
| committer | Joseph Warner <hardolaf@gmail.com> | 2012-05-13 13:05:20 -0400 |
| commit | 47c6b32d874826e4994c6589ed21a4fd9b4556d5 (patch) | |
| tree | 90fcddd7a2d53f86619b2273e9dabf2c11ca87ff /phpBB/includes/startup.php | |
| parent | 1fd2795cf04901e6cefb6e6f90effaeb194b4837 (diff) | |
| download | forums-47c6b32d874826e4994c6589ed21a4fd9b4556d5.tar forums-47c6b32d874826e4994c6589ed21a4fd9b4556d5.tar.gz forums-47c6b32d874826e4994c6589ed21a4fd9b4556d5.tar.bz2 forums-47c6b32d874826e4994c6589ed21a4fd9b4556d5.tar.xz forums-47c6b32d874826e4994c6589ed21a4fd9b4556d5.zip | |
[ticket/10893] Update the usage of Composer
Changes 'vendor/.composer/autoload.php' to 'vendor/autoload.php'
as per the change in the way that composer works as noted
https://groups.google.com/forum/#!msg/composer-dev/fWIs3KocwoA/nU3aLko9LhQJ
PHPBB3-10893
Diffstat (limited to 'phpBB/includes/startup.php')
| -rw-r--r-- | phpBB/includes/startup.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/startup.php b/phpBB/includes/startup.php index f75d70e366..441eaec6b1 100644 --- a/phpBB/includes/startup.php +++ b/phpBB/includes/startup.php @@ -150,7 +150,7 @@ if (function_exists('date_default_timezone_set') && function_exists('date_defaul // Autoloading of dependencies. // Three options are supported: // 1. If dependencies are installed with Composer, Composer will create a -// vendor/.composer/autoload.php. If this file exists it will be +// vendor/autoload.php. If this file exists it will be // automatically used by phpBB. This is the default mode that phpBB // will use when shipped. // 2. To disable composer autoloading, PHPBB_NO_COMPOSER_AUTOLOAD can be specified. @@ -171,11 +171,11 @@ if (getenv('PHPBB_NO_COMPOSER_AUTOLOAD')) } else { - if (!file_exists($phpbb_root_path . 'vendor/.composer/autoload.php')) + if (!file_exists($phpbb_root_path . 'vendor/autoload.php')) { trigger_error('You have not set up composer dependencies. See http://getcomposer.org/.', E_USER_ERROR); } - require($phpbb_root_path . 'vendor/.composer/autoload.php'); + require($phpbb_root_path . 'vendor/autoload.php'); } $starttime = explode(' ', microtime()); |