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 "Make copyTestData work on postgres"
[lhc/web/wiklou.git]
/
includes
/
installer
/
Installer.php
diff --git
a/includes/installer/Installer.php
b/includes/installer/Installer.php
index
20661f2
..
0bc0a83
100644
(file)
--- a/
includes/installer/Installer.php
+++ b/
includes/installer/Installer.php
@@
-686,10
+686,10
@@
abstract class Installer {
* @return string
*/
public function parse( $text, $lineStart = false ) {
* @return string
*/
public function parse( $text, $lineStart = false ) {
-
global $wgParser
;
+
$parser = MediaWikiServices::getInstance()->getParser()
;
try {
try {
- $out = $
wgP
arser->parse( $text, $this->parserTitle, $this->parserOptions, $lineStart );
+ $out = $
p
arser->parse( $text, $this->parserTitle, $this->parserOptions, $lineStart );
$html = $out->getText( [
'enableSectionEditLinks' => false,
'unwrap' => true,
$html = $out->getText( [
'enableSectionEditLinks' => false,
'unwrap' => true,
@@
-866,8
+866,7
@@
abstract class Installer {
}
if ( !$caches ) {
}
if ( !$caches ) {
- $key = 'config-no-cache-apcu';
- $this->showMessage( $key );
+ $this->showMessage( 'config-no-cache-apcu' );
}
$this->setVar( '_Caches', $caches );
}
$this->setVar( '_Caches', $caches );
@@
-1184,8
+1183,8
@@
abstract class Installer {
public function dirIsExecutable( $dir, $url ) {
$scriptTypes = [
'php' => [
public function dirIsExecutable( $dir, $url ) {
$scriptTypes = [
'php' => [
- "<?php echo 'ex
' . '
ec';",
- "#!/var/env php\n<?php echo 'ex
' . '
ec';",
+ "<?php echo 'exec';",
+ "#!/var/env php\n<?php echo 'exec';",
],
];
],
];
@@
-1633,8
+1632,7
@@
abstract class Installer {
}
/**
}
/**
- * Generate a secret value for variables using our CryptRand generator.
- * Produce a warning if the random source was insecure.
+ * Generate a secret value for variables using a secure generator.
*
* @param array $keys
* @return Status
*
* @param array $keys
* @return Status