Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/11266] Better message for when composer dependencies are missing.
This commit is contained in:
Joas Schilling 2014-05-30 22:58:17 +02:00
commit be8770532c

View file

@ -177,7 +177,11 @@ else
{ {
if (!file_exists($phpbb_root_path . 'vendor/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); 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'); require($phpbb_root_path . 'vendor/autoload.php');
} }