r80151 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r80150‎ | r80151 | r80152 >
Date:01:38, 13 January 2011
Author:tomasz
Status:deferred
Tags:
Comment:
Merge up to head of trunk from r80149
Modified paths:
  • /branches/wmf/1.16wmf4/extensions/CentralNotice (modified) (history)
  • /branches/wmf/1.16wmf4/extensions/CentralNotice/SpecialHideBanners.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.16wmf4/extensions/CentralNotice/SpecialHideBanners.php
@@ -15,17 +15,15 @@
1616 function execute( $par ) {
1717 global $wgAllowHideBanners, $wgRequest, $wgOut;
1818
19 - if ( $wgAllowHideBanners ) {
20 - $this->setHideCookie();
 19+ $this->setHideCookie();
2120
22 - $wgOut->disable();
23 - wfResetOutputBuffers();
 21+ $wgOut->disable();
 22+ wfResetOutputBuffers();
2423
25 - header( 'Content-Type: image/png' );
26 - header( 'Cache-Control: no-cache' );
 24+ header( 'Content-Type: image/png' );
 25+ header( 'Cache-Control: no-cache' );
2726
28 - readfile( dirname( __FILE__ ) . '/1x1.png' );
29 - }
 27+ readfile( dirname( __FILE__ ) . '/1x1.png' );
3028 }
3129
3230 function setHideCookie() {
Property changes on: branches/wmf/1.16wmf4/extensions/CentralNotice
___________________________________________________________________
Modified: svn:mergeinfo
3331 Merged /trunk/extensions/CentralNotice:r80150

Follow-up revisions

RevisionCommit summaryAuthorDate
r80604Merge up to head of trunk from r80151tomasz00:21, 20 January 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r80149Merge up to head of trunk from r80146tomasz01:19, 13 January 2011

Status & tagging log