diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-05-14 00:01:34 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-05-14 00:01:34 +0200 |
| commit | 9b96c1fb78c1cfcbc57e2206cd5d6f24f0c5922c (patch) | |
| tree | 60a48819c6e67c34fd8f376d5f801a08e85b85ea | |
| parent | 2715fc5bdf1f922f5c4764dd3c60aba06901a248 (diff) | |
| parent | 47c6b32d874826e4994c6589ed21a4fd9b4556d5 (diff) | |
| download | forums-9b96c1fb78c1cfcbc57e2206cd5d6f24f0c5922c.tar forums-9b96c1fb78c1cfcbc57e2206cd5d6f24f0c5922c.tar.gz forums-9b96c1fb78c1cfcbc57e2206cd5d6f24f0c5922c.tar.bz2 forums-9b96c1fb78c1cfcbc57e2206cd5d6f24f0c5922c.tar.xz forums-9b96c1fb78c1cfcbc57e2206cd5d6f24f0c5922c.zip | |
Merge remote-tracking branch 'github-hardolaf/ticket/10893' into develop
* github-hardolaf/ticket/10893:
[ticket/10893] Update the usage of Composer
| -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()); |