r97670 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r97669‎ | r97670 | r97671 >
Date:22:04, 20 September 2011
Author:asher
Status:ok
Tags:live 
Comment:
live hack - prevent resourceloader from serving errors when a db master is set to read-only
Modified paths:
  • /branches/wmf/1.17wmf1/includes/resourceloader/ResourceLoaderFileModule.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.17wmf1/includes/resourceloader/ResourceLoaderFileModule.php
@@ -269,7 +269,7 @@
270270 // Collect referenced files
271271 $this->localFileRefs = array_unique( $this->localFileRefs );
272272 // If the list has been modified since last time we cached it, update the cache
273 - if ( $this->localFileRefs !== $this->getFileDependencies( $context->getSkin() ) ) {
 273+ if ( $this->localFileRefs !== $this->getFileDependencies( $context->getSkin() ) && !wfReadOnly() ) {
274274 $dbw = wfGetDB( DB_MASTER );
275275 $dbw->replace( 'module_deps',
276276 array( array( 'md_module', 'md_skin' ) ), array(

Follow-up revisions

RevisionCommit summaryAuthorDate
r98295Merged r94614 from trunk and r97670 from 1.17wmf1tstarling00:49, 28 September 2011
r98761Merge r97670, r98206reedy13:41, 3 October 2011

Status & tagging log