aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-05-30 22:58:17 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-05-30 22:58:17 +0200
commitbe8770532c8bda7b5d73075705518ac1bb5d3d37 (patch)
treef97e015578b1dc2a678e92b51acf17d4dbc6aa15
parentee8e5bcf371bc17ee4d65672658e4fe8ea377b07 (diff)
parent669a6c3e3d29688b69bb0fb39dd7d4099c78ffbd (diff)
downloadforums-be8770532c8bda7b5d73075705518ac1bb5d3d37.tar
forums-be8770532c8bda7b5d73075705518ac1bb5d3d37.tar.gz
forums-be8770532c8bda7b5d73075705518ac1bb5d3d37.tar.bz2
forums-be8770532c8bda7b5d73075705518ac1bb5d3d37.tar.xz
forums-be8770532c8bda7b5d73075705518ac1bb5d3d37.zip
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/11266] Better message for when composer dependencies are missing.
-rw-r--r--phpBB/includes/startup.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/includes/startup.php b/phpBB/includes/startup.php
index 65a193193a..50fcd11bee 100644
--- a/phpBB/includes/startup.php
+++ b/phpBB/includes/startup.php
@@ -177,7 +177,11 @@ else
{
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);
+ trigger_error(
+ 'Composer dependencies have not been set up yet, run ' .
+ "'php ../composer.phar install' from the phpBB directory to do so.",
+ E_USER_ERROR
+ );
}
require($phpbb_root_path . 'vendor/autoload.php');
}