Merge r97670, r98206

diff --git a/includes/Skin.php b/includes/Skin.php
index a70c568..0b02a98 100644 (file)
--- 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 0b006bf..73ae0d2 100644 (file)
--- 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(