| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -551,12 +551,6 @@ |
| 552 | 552 | 'action' => 'raw', |
| 553 | 553 | 'maxage' => $wgSquidMaxage, |
| 554 | 554 | ); |
| 555 | | - if( $wgUser->isLoggedIn() ) { |
| 556 | | - // Ensure that logged-in users' generated CSS isn't clobbered |
| 557 | | - // by anons' publicly cacheable generated CSS. |
| 558 | | - $siteargs['smaxage'] = '0'; |
| 559 | | - $siteargs['ts'] = $wgUser->mTouched; |
| 560 | | - } |
| 561 | 555 | |
| 562 | 556 | // Add any extension CSS |
| 563 | 557 | foreach( $out->getExtStyle() as $tag ) { |
| — | — | @@ -573,14 +567,20 @@ |
| 574 | 568 | 'smaxage' => $wgSquidMaxage |
| 575 | 569 | ) + $siteargs ); |
| 576 | 570 | # Site settings must override extension css! (bug 15025) |
| 577 | | - $out->addStyle( self::makeNSUrl( 'Common.css', $query, NS_MEDIAWIKI) ); |
| 578 | | - $out->addStyle( self::makeNSUrl( 'Print.css', $query, NS_MEDIAWIKI), "print" ); |
| | 571 | + $out->addStyle( self::makeNSUrl( 'Common.css', $query, NS_MEDIAWIKI ) ); |
| | 572 | + $out->addStyle( self::makeNSUrl( 'Print.css', $query, NS_MEDIAWIKI ), 'print' ); |
| 579 | 573 | if( $wgHandheldStyle ) { |
| 580 | | - $out->addStyle( self::makeNSUrl( 'Handheld.css', $query, NS_MEDIAWIKI), "handheld" ); |
| | 574 | + $out->addStyle( self::makeNSUrl( 'Handheld.css', $query, NS_MEDIAWIKI ), 'handheld' ); |
| 581 | 575 | } |
| 582 | 576 | $out->addStyle( self::makeNSUrl( $this->getSkinName() . '.css', $query, NS_MEDIAWIKI ) ); |
| 583 | 577 | } |
| 584 | 578 | |
| | 579 | + if( $wgUser->isLoggedIn() ) { |
| | 580 | + // Ensure that logged-in users' generated CSS isn't clobbered |
| | 581 | + // by anons' publicly cacheable generated CSS. |
| | 582 | + $siteargs['smaxage'] = '0'; |
| | 583 | + $siteargs['ts'] = $wgUser->mTouched; |
| | 584 | + } |
| 585 | 585 | // Per-user styles based on preferences |
| 586 | 586 | $siteargs['gen'] = 'css'; |
| 587 | 587 | if( ( $us = $wgRequest->getVal( 'useskin', '' ) ) !== '' ) { |
| — | — | @@ -597,8 +597,8 @@ |
| 598 | 598 | // @FIXME: properly escape the cdata! |
| 599 | 599 | $this->usercss = "/*<![CDATA[*/\n" . $previewCss . "/*]]>*/"; |
| 600 | 600 | } else { |
| 601 | | - $out->addStyle( self::makeUrl($this->userpage .'/'.$this->getSkinName() .'.css', |
| 602 | | - 'action=raw&ctype=text/css') ); |
| | 601 | + $out->addStyle( self::makeUrl($this->userpage . '/' . $this->getSkinName() .'.css', |
| | 602 | + 'action=raw&ctype=text/css' ) ); |
| 603 | 603 | } |
| 604 | 604 | } |
| 605 | 605 | |