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 "Change ResultWrapper to IResultWrapper in pagers and special pages"
[lhc/web/wiklou.git]
/
includes
/
installer
/
Installer.php
diff --git
a/includes/installer/Installer.php
b/includes/installer/Installer.php
index
f5e12d6
..
7cfc617
100644
(file)
--- a/
includes/installer/Installer.php
+++ b/
includes/installer/Installer.php
@@
-24,6
+24,7
@@
* @ingroup Deployment
*/
use MediaWiki\MediaWikiServices;
* @ingroup Deployment
*/
use MediaWiki\MediaWikiServices;
+use MediaWiki\Shell\Shell;
/**
* This documentation group collects source code files with deployment functionality.
/**
* This documentation group collects source code files with deployment functionality.
@@
-990,17
+991,17
@@
abstract class Installer {
}
# Get a list of available locales.
}
# Get a list of available locales.
- $re
t = false;
-
$lines = wfShellExec( '/usr/bin/locale -a', $ret
);
+ $re
sult = Shell::command( '/usr/bin/locale', '-a' )
+
->execute(
);
- if ( $re
t
) {
+ if ( $re
sult->getExitCode() != 0
) {
return true;
}
return true;
}
+ $lines = $result->getStdout();
$lines = array_map( 'trim', explode( "\n", $lines ) );
$candidatesByLocale = [];
$candidatesByLang = [];
$lines = array_map( 'trim', explode( "\n", $lines ) );
$candidatesByLocale = [];
$candidatesByLang = [];
-
foreach ( $lines as $line ) {
if ( $line === '' ) {
continue;
foreach ( $lines as $line ) {
if ( $line === '' ) {
continue;