r98761 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r98760‎ | r98761 | r98762 >
Date:13:41, 3 October 2011
Author:reedy
Status:ok
Tags:
Comment:
Merge r97670, r98206
Modified paths:
  • /trunk/phase3/includes/Skin.php (modified) (history)
  • /trunk/phase3/includes/resourceloader/ResourceLoaderFileModule.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/resourceloader/ResourceLoaderFileModule.php
@@ -262,7 +262,7 @@
263263 // Collect referenced files
264264 $this->localFileRefs = array_unique( $this->localFileRefs );
265265 // If the list has been modified since last time we cached it, update the cache
266 - if ( $this->localFileRefs !== $this->getFileDependencies( $context->getSkin() ) ) {
 266+ if ( $this->localFileRefs !== $this->getFileDependencies( $context->getSkin() ) && !wfReadOnly() ) {
267267 $dbw = wfGetDB( DB_MASTER );
268268 $dbw->replace( 'module_deps',
269269 array( array( 'md_module', 'md_skin' ) ), array(
Index: trunk/phase3/includes/Skin.php
@@ -268,7 +268,7 @@
269269 if ( User::isIP( $rootUser ) ) {
270270 $this->mRelevantUser = User::newFromName( $rootUser, false );
271271 } else {
272 - $user = User::newFromName( $rootUser );
 272+ $user = User::newFromName( $rootUser, false );
273273 if ( $user->isLoggedIn() ) {
274274 $this->mRelevantUser = $user;
275275 }

Follow-up revisions

RevisionCommit summaryAuthorDate
r99996MFT r98760, r98761reedy22:40, 16 October 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r97670live hack - prevent resourceloader from serving errors when a db master is se...asher22:04, 20 September 2011
r98206fixed newFromName() related fatalaaron01:41, 27 September 2011

Status & tagging log