r77650 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r77649‎ | r77650 | r77651 >
Date:13:46, 3 December 2010
Author:demon
Status:ok
Tags:
Comment:
Fix for r76480: !$css was never true, since it always contained \n. This way also lets us at least show one file if the other is inaccessible for less breakage.
Modified paths:
  • /trunk/phase3/includes/installer/WebInstallerOutput.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/installer/WebInstallerOutput.php
@@ -92,10 +92,12 @@
9393 $vectorCss = file_get_contents( $vectorCssFile );
9494 $configCss = file_get_contents( $configCssFile );
9595 wfRestoreWarnings();
96 - $css = str_replace( 'images/', '../skins/vector/images/', $vectorCss ) . "\n" . str_replace( 'images/', '../skins/common/images/', $configCss );
97 - if( !$css ) {
98 - return "/** Your webserver cannot read $vectorCssFile or $configCssFile, please check file permissions */";
99 - } elseif( $dir == 'rtl' ) {
 96+ if( !$vectorCss || !$configCss ) {
 97+ $css = "/** Your webserver cannot read $vectorCssFile or $configCssFile, please check file permissions */";
 98+ }
 99+
 100+ $css .= str_replace( 'images/', '../skins/vector/images/', $vectorCss ) . "\n" . str_replace( 'images/', '../skins/common/images/', $configCss );
 101+ if( $dir == 'rtl' ) {
100102 $css = CSSJanus::transform( $css, true );
101103 }
102104 return $css;

Follow-up revisions

RevisionCommit summaryAuthorDate
r77946Fix r77650, notice about undefined $css; was causing the serif font issue toodemon01:42, 7 December 2010

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r76480Combine config.css with vector.css so it gets flipped too, plus one less requ...demon22:11, 10 November 2010

Status & tagging log