diff options
| author | Vjacheslav Trushkin <arty@phpbb.com> | 2012-03-31 10:43:06 +0300 |
|---|---|---|
| committer | Vjacheslav Trushkin <arty@phpbb.com> | 2012-03-31 10:43:06 +0300 |
| commit | 398a6c8045113f14900bdea8c70ba032f75b45f6 (patch) | |
| tree | 1a9ff30f5eeca6faf0adbd314b60caf1869079c5 /phpBB/includes/startup.php | |
| parent | 506951e8aff98582ebc56fcda9ed0626497ade77 (diff) | |
| parent | 013a8649a5164b90310e76d99fae2186b831a5f0 (diff) | |
| download | forums-398a6c8045113f14900bdea8c70ba032f75b45f6.tar forums-398a6c8045113f14900bdea8c70ba032f75b45f6.tar.gz forums-398a6c8045113f14900bdea8c70ba032f75b45f6.tar.bz2 forums-398a6c8045113f14900bdea8c70ba032f75b45f6.tar.xz forums-398a6c8045113f14900bdea8c70ba032f75b45f6.zip | |
Merge branch 'develop' into feature/merging-style-components
* develop: (175 commits)
[feature/ajax] Remove strange non-breaking spaces from approve button
[feature/ajax] Add entirely unrelated but nice newlines
[feature/ajax] Unify phpbb_json_response instantiation
[feature/ajax] Fix acp_styles activate_deactivate ajax callback name
[feature/ajax] Send correct activate/deactivate JSON response in acp_profile
[ticket/10270] Alter background colors for posts
[feature/ajax] Remove not working module enable/disable ajax code
[feature/ajax] Replace static call to phpbb_request with OO
[feature/ajax] Remove quick-reply AJAX handling until we have something good
[ticket/10270] Changing close button for ajax popups
[ticket/10270] Disabling links in disappearing content
[ticket/10291] Fixed an AJAX bug on quick reply form submit.
[ticket/10273] Fixed accepting / denying posts AJAX.
[ticket/10272] Removed code that was prevent event propogation in AJAX.
[ticket/10291] Fixed a bug in the quick reply AJAX.
[feature/ajax] Handle acp_modules error cases with JSON response
[feature/ajax] Fix filter check, quick mod tools data-attribute
[feature/ajax] Use the error handler
[feature/ajax] Generic error handling with a phpbb.alert box
[feature/ajax] Change filter semantics, some minor adjustments
...
Conflicts:
phpBB/adm/style/acp_styles.html
phpBB/includes/acp/acp_styles.php
Diffstat (limited to 'phpBB/includes/startup.php')
| -rw-r--r-- | phpBB/includes/startup.php | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/phpBB/includes/startup.php b/phpBB/includes/startup.php index fc45cd882b..f75d70e366 100644 --- a/phpBB/includes/startup.php +++ b/phpBB/includes/startup.php @@ -147,5 +147,36 @@ if (function_exists('date_default_timezone_set') && function_exists('date_defaul date_default_timezone_set(@date_default_timezone_get()); } +// 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 +// 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. +// Additionally specify PHPBB_AUTOLOAD=/path/to/autoload.php in the +// environment. This is useful for running CLI scripts and tests. +// /path/to/autoload.php should define and register class loaders +// for all of phpBB's dependencies. +// 3. You can also set PHPBB_NO_COMPOSER_AUTOLOAD without setting PHPBB_AUTOLOAD. +// In this case autoloading needs to be defined before running any phpBB +// script. This might be useful in cases when phpBB is integrated into a +// larger program. +if (getenv('PHPBB_NO_COMPOSER_AUTOLOAD')) +{ + if (getenv('PHPBB_AUTOLOAD')) + { + require(getenv('PHPBB_AUTOLOAD')); + } +} +else +{ + if (!file_exists($phpbb_root_path . 'vendor/.composer/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'); +} + $starttime = explode(' ', microtime()); $starttime = $starttime[1] + $starttime[0]; |