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 "MCR: replace slot_inherited with slot_origin"
[lhc/web/wiklou.git]
/
includes
/
installer
/
LocalSettingsGenerator.php
diff --git
a/includes/installer/LocalSettingsGenerator.php
b/includes/installer/LocalSettingsGenerator.php
index
a9710eb
..
b4ef49d
100644
(file)
--- a/
includes/installer/LocalSettingsGenerator.php
+++ b/
includes/installer/LocalSettingsGenerator.php
@@
-41,8
+41,6
@@
class LocalSettingsGenerator {
protected $installer;
/**
protected $installer;
/**
- * Constructor.
- *
* @param Installer $installer
*/
public function __construct( Installer $installer ) {
* @param Installer $installer
*/
public function __construct( Installer $installer ) {
@@
-187,7
+185,7
@@
class LocalSettingsGenerator {
$jsonFile = 'skin.json';
$function = 'wfLoadSkin';
} else {
$jsonFile = 'skin.json';
$function = 'wfLoadSkin';
} else {
- throw new InvalidArgumentException( '$dir was not "extensions" or "skins' );
+ throw new InvalidArgumentException( '$dir was not "extensions" or "skins
"
' );
}
$encName = self::escapePhpString( $name );
}
$encName = self::escapePhpString( $name );