From eacecf4ed22670a46b15935ffa874227af365616 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Mon, 3 Oct 2011 13:41:50 +0000 Subject: [PATCH] Merge r97670, r98206 --- includes/Skin.php | 2 +- includes/resourceloader/ResourceLoaderFileModule.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/Skin.php b/includes/Skin.php index a70c568ec2..0b02a9849f 100644 --- a/includes/Skin.php +++ b/includes/Skin.php @@ -268,7 +268,7 @@ abstract class Skin extends ContextSource { if ( User::isIP( $rootUser ) ) { $this->mRelevantUser = User::newFromName( $rootUser, false ); } else { - $user = User::newFromName( $rootUser ); + $user = User::newFromName( $rootUser, false ); if ( $user->isLoggedIn() ) { $this->mRelevantUser = $user; } diff --git a/includes/resourceloader/ResourceLoaderFileModule.php b/includes/resourceloader/ResourceLoaderFileModule.php index 0b006bf8d4..73ae0d2d98 100644 --- a/includes/resourceloader/ResourceLoaderFileModule.php +++ b/includes/resourceloader/ResourceLoaderFileModule.php @@ -262,7 +262,7 @@ class ResourceLoaderFileModule extends ResourceLoaderModule { // Collect referenced files $this->localFileRefs = array_unique( $this->localFileRefs ); // If the list has been modified since last time we cached it, update the cache - if ( $this->localFileRefs !== $this->getFileDependencies( $context->getSkin() ) ) { + if ( $this->localFileRefs !== $this->getFileDependencies( $context->getSkin() ) && !wfReadOnly() ) { $dbw = wfGetDB( DB_MASTER ); $dbw->replace( 'module_deps', array( array( 'md_module', 'md_skin' ) ), array( -- 2.20.1