r75253 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r75252‎ | r75253 | r75254 >
Date:15:42, 23 October 2010
Author:catrope
Status:ok
Tags:
Comment:
Per r72349 CR, bring gen=js behavior back, at least for now. It'd be nasty to serve weird stuff to people still hitting gen=js with old code.
Modified paths:
  • /trunk/phase3/includes/RawPage.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/RawPage.php
@@ -82,6 +82,10 @@
8383 if( $ctype == '' ) {
8484 $ctype = 'text/css';
8585 }
 86+ } elseif( $gen == 'js' ) {
 87+ $this->mGen = $gen;
 88+ if( is_null( $smaxage ) ) $smaxage = $wgSquidMaxage;
 89+ if($ctype == '') $ctype = $wgJsMimeType;
8690 } else {
8791 $this->mGen = false;
8892 }
@@ -170,6 +174,8 @@
171175 $sk->initPage( $wgOut );
172176 if( $this->mGen == 'css' ) {
173177 return $sk->generateUserStylesheet();
 178+ } else if( $this->mGen == 'js' ) {
 179+ return $sk->generateUserJs();
174180 }
175181 } else {
176182 return $this->getArticleText();

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r72349Merging resourceloader branch into trunk. Full documentation is at http://www...catrope04:00, 4 September 2010

Status & tagging log