diff options
| author | wctaiwan <wctaiwan@gmail.com> | 2021-11-13 23:05:27 -0800 |
|---|---|---|
| committer | Reedy <reedy@wikimedia.org> | 2021-11-17 20:46:40 +0000 |
| commit | 6687e8f9aab6b864b2189a0027ab09aa71e1adce (patch) | |
| tree | e66387a25f31ca4e945fd0ff93b1a9cba895fa27 | |
| parent | ca9f106a54b2c54a2cb2705b56e0b084a6bb597c (diff) | |
Tweak error message for missing composer dependencies
I tried doing this in Id9a6cf9ee2520db9d405e17eaf34b10bd72897f3 but
the error message modified in that patch was specific to the PSR-3
logging library, not for missing composer dependencies. This patch
modifies the error message for the latter as well.
Change-Id: I713a9037b8c5dc71bf03fb2ec791b3ce63e5f1be
(cherry picked from commit e3033bb44735801f180ac9d0e9016f877fed0f30)
| -rw-r--r-- | includes/PHPVersionCheck.php | 6 | ||||
| -rw-r--r-- | includes/Setup.php | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/includes/PHPVersionCheck.php b/includes/PHPVersionCheck.php index 4c95d26433c1..23d7785960ab 100644 --- a/includes/PHPVersionCheck.php +++ b/includes/PHPVersionCheck.php @@ -170,9 +170,9 @@ HTML; $web['longHtml'] = <<<HTML <p> MediaWiki also has some external dependencies that need to be installed via - composer or from a separate git repo. Please see - <a href="https://www.mediawiki.org/wiki/Download_from_Git#Fetch_external_libraries">mediawiki.org</a> - for help on installing the required components. + composer or from a separate git repo. Please see the + <a href="https://www.mediawiki.org/wiki/Download_from_Git#Fetch_external_libraries">instructions + for installing libraries</a> on mediawiki.org for help on installing the required components. </p> HTML; // phpcs:enable Generic.Files.LineLength diff --git a/includes/Setup.php b/includes/Setup.php index 212c97194909..32f0ca213055 100644 --- a/includes/Setup.php +++ b/includes/Setup.php @@ -118,9 +118,9 @@ if ( !interface_exists( LoggerInterface::class ) ) { 'MediaWiki requires the <a href="https://github.com/php-fig/log">PSR-3 logging ' . "library</a> to be present. This library is not embedded directly in MediaWiki's " . "git repository and must be installed separately by the end user.\n\n" . - 'Please see <a href="https://www.mediawiki.org/wiki/Download_from_Git' . - '#Fetch_external_libraries">this page on mediawiki.org</a> for help on installing ' . - 'the required components.' + 'Please see the <a href="https://www.mediawiki.org/wiki/Download_from_Git' . + '#Fetch_external_libraries">instructions for installing libraries</a> on mediawiki.org ' . + 'for help on installing the required components.' ); echo $message; trigger_error( $message, E_USER_ERROR ); |