dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Support Mustache partials in Mustache template module"
[lhc/web/wiklou.git]
/
includes
/
PHPVersionCheck.php
diff --git
a/includes/PHPVersionCheck.php
b/includes/PHPVersionCheck.php
index
233ebf2
..
41e88c2
100644
(file)
--- a/
includes/PHPVersionCheck.php
+++ b/
includes/PHPVersionCheck.php
@@
-40,7
+40,9
@@
function wfEntryPointCheck( $entryPoint ) {
wfPHPVersionError( $entryPoint, $mwVersion, $minimumVersionPHP, $phpVersion );
}
wfPHPVersionError( $entryPoint, $mwVersion, $minimumVersionPHP, $phpVersion );
}
+ // @codingStandardsIgnoreStart MediaWiki.Usage.DirUsage.FunctionFound
if ( !file_exists( dirname( __FILE__ ) . '/../vendor/autoload.php' ) ) {
if ( !file_exists( dirname( __FILE__ ) . '/../vendor/autoload.php' ) ) {
+ // @codingStandardsIgnoreEnd
wfMissingVendorError( $entryPoint, $mwVersion );
}
}
wfMissingVendorError( $entryPoint, $mwVersion );
}
}
@@
-180,7
+182,7
@@
HTML;
* @param string $mwVersion See wfGenericError
*/
function wfMissingVendorError( $type, $mwVersion ) {
* @param string $mwVersion See wfGenericError
*/
function wfMissingVendorError( $type, $mwVersion ) {
- $shortText = "Installing some external dependencies (e.g. via composer) is
also
required.";
+ $shortText = "Installing some external dependencies (e.g. via composer) is required.";
$longText = "Error: You are missing some external dependencies. \n"
. "MediaWiki now also has some external dependencies that need to be installed\n"
$longText = "Error: You are missing some external dependencies. \n"
. "MediaWiki now also has some external dependencies that need to be installed\n"