r69536 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r69535‎ | r69536 | r69537 >
Date:08:19, 19 July 2010
Author:catrope
Status:ok (Comments)
Tags:
Comment:
Reverse-merge r69521 from 1.16wmf4: fix OpenSearch caching
Modified paths:
  • /trunk/phase3/includes/api (modified) (history)
  • /trunk/phase3/includes/api/ApiMain.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/api/ApiMain.php
——@@ -332,7 +332,7 @@
333333 }
334334
335335 // If this wiki is private, don't cache anything ever
336 - if ( in_array( 'read', User::getGroupPermissions( array( '*' ) ), true ) ) {
 336+ if ( ! in_array( 'read', User::getGroupPermissions( array( '*' ) ), true ) ) {
337337 $this->setCachePrivate();
338338 }
339339
Property changes on: trunk/phase3/includes/api
___________________________________________________________________
Modified: svn:mergeinfo
340340 Merged /branches/wmf/1.16wmf4/includes/api:r69521

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r69521One tiny missing character - one overloaded cluster! :-)midom21:21, 18 July 2010

Comments

#Comment by Tim Starling (talk | contribs)   02:34, 20 July 2010

"Reverse-merge" is Subversion jargon for revert, i.e. to merge the reverse of a given diff. This is a plain old forward merge, but from 1.16wmf4 rather than from trunk.

Status & tagging log