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 "RCFilters: Filter duplicates when filtering for multiple tags"
[lhc/web/wiklou.git]
/
includes
/
installer
/
CliInstaller.php
diff --git
a/includes/installer/CliInstaller.php
b/includes/installer/CliInstaller.php
index
55ec8df
..
6ac78c4
100644
(file)
--- a/
includes/installer/CliInstaller.php
+++ b/
includes/installer/CliInstaller.php
@@
-30,7
+30,7
@@
class CliInstaller extends Installer {
private $specifiedScriptPath = false;
class CliInstaller extends Installer {
private $specifiedScriptPath = false;
- private $optionMap =
array(
+ private $optionMap =
[
'dbtype' => 'wgDBtype',
'dbserver' => 'wgDBserver',
'dbname' => 'wgDBname',
'dbtype' => 'wgDBtype',
'dbserver' => 'wgDBserver',
'dbname' => 'wgDBname',
@@
-44,16
+44,14
@@
class CliInstaller extends Installer {
'dbpath' => 'wgSQLiteDataDir',
'server' => 'wgServer',
'scriptpath' => 'wgScriptPath',
'dbpath' => 'wgSQLiteDataDir',
'server' => 'wgServer',
'scriptpath' => 'wgScriptPath',
-
)
;
+
]
;
/**
/**
- * Constructor.
- *
* @param string $siteName
* @param string $admin
* @param array $option
*/
* @param string $siteName
* @param string $admin
* @param array $option
*/
- function __construct( $siteName, $admin = null, array $option =
array()
) {
+ function __construct( $siteName, $admin = null, array $option =
[]
) {
global $wgContLang;
parent::__construct();
global $wgContLang;
parent::__construct();
@@
-131,8
+129,8
@@
class CliInstaller extends Installer {
}
$this->performInstallation(
}
$this->performInstallation(
-
array( $this, 'startStage' )
,
- array( $this, 'endStage' )
+
[ $this, 'startStage' ]
,
+ [ $this, 'endStage' ]
);
}
);
}
@@
-180,7
+178,7
@@
class CliInstaller extends Installer {
$text = preg_replace( '/<a href="(.*?)".*?>(.*?)<\/a>/', '$2 <$1>', $text );
$text = preg_replace( '/<a href="(.*?)".*?>(.*?)<\/a>/', '$2 <$1>', $text );
- return
html_entity_decode( strip_tags( $text ), ENT_QUOTES
);
+ return
Sanitizer::stripAllTags( $text
);
}
/**
}
/**
@@
-195,11
+193,11
@@
class CliInstaller extends Installer {
if ( count( $warnings ) !== 0 ) {
foreach ( $warnings as $w ) {
if ( count( $warnings ) !== 0 ) {
foreach ( $warnings as $w ) {
- call_user_func_array(
array( $this, 'showMessage' )
, $w );
+ call_user_func_array(
[ $this, 'showMessage' ]
, $w );
}
}
}
}
- if ( !$status->isO
k
() ) {
+ if ( !$status->isO
K
() ) {
echo "\n";
exit( 1 );
}
echo "\n";
exit( 1 );
}