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 "Corrected the spelling of language name 'cu'"
[lhc/web/wiklou.git]
/
includes
/
installer
/
WebInstallerOutput.php
diff --git
a/includes/installer/WebInstallerOutput.php
b/includes/installer/WebInstallerOutput.php
index
fd91bcb
..
00a4ff8
100644
(file)
--- a/
includes/installer/WebInstallerOutput.php
+++ b/
includes/installer/WebInstallerOutput.php
@@
-124,9
+124,9
@@
class WebInstallerOutput {
$prepend = '';
$css = '';
$prepend = '';
$css = '';
- $cssFileNames = array();
$resourceLoader = new ResourceLoader();
foreach ( $moduleNames as $moduleName ) {
$resourceLoader = new ResourceLoader();
foreach ( $moduleNames as $moduleName ) {
+ /** @var ResourceLoaderFileModule $module */
$module = $resourceLoader->getModule( $moduleName );
$cssFileNames = $module->getAllStyleFiles();
$module = $resourceLoader->getModule( $moduleName );
$cssFileNames = $module->getAllStyleFiles();
@@
-138,7
+138,8
@@
class WebInstallerOutput {
}
if ( !is_readable( $cssFileName ) ) {
}
if ( !is_readable( $cssFileName ) ) {
- $prepend .= ResourceLoader::makeComment( "Unable to read $cssFileName. Please check file permissions." );
+ $prepend .= ResourceLoader::makeComment( "Unable to read $cssFileName. " .
+ "Please check file permissions." );
continue;
}
continue;
}
@@
-170,7
+171,6
@@
class WebInstallerOutput {
} else {
$prepend .= ResourceLoader::makeComment( "Unable to read $cssFileName." );
}
} else {
$prepend .= ResourceLoader::makeComment( "Unable to read $cssFileName." );
}
-
} catch ( Exception $e ) {
$prepend .= ResourceLoader::formatException( $e );
}
} catch ( Exception $e ) {
$prepend .= ResourceLoader::formatException( $e );
}