Merge "Removed partly obsolete and redundant BagOStuff comment"

diff --git a/includes/EditPage.php b/includes/EditPage.php
index b0da562..e88baaf 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1958,11 +1958,13 @@ class EditPage {
 
                if ( $this->changeTags && isset( $doEditStatus->value['revision'] ) ) {
                        // If a revision was created, apply any change tags that were requested
-                       ChangeTags::addTags(
-                               $this->changeTags,
-                               isset( $doEditStatus->value['rc'] ) ? $doEditStatus->value['rc']->mAttribs['rc_id'] : null,
-                               $doEditStatus->value['revision']->getId()
-                       );
+                       $addTags = $this->changeTags;
+                       $revId = $doEditStatus->value['revision']->getId();
+                       // Defer this both for performance and so that addTags() sees the rc_id
+                       // since the recentchange entry addition is deferred first (bug T100248)
+                       DeferredUpdates::addCallableUpdate( function() use ( $addTags, $revId ) {
+                               ChangeTags::addTags( $addTags, null, $revId );
+                       } );
                }
 
                return $status;

diff --git a/resources/Resources.php b/resources/Resources.php
index b0cd932..1c3ea25 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -39,6 +39,7 @@ return array(
                'group' => 'noscript',
        ),
        'filepage' => array(
+               'position' => 'top',
                'class' => 'ResourceLoaderWikiModule',
                'styles' => array( 'MediaWiki:Filepage.css' ),
        ),
@@ -1161,9 +1162,9 @@ return array(
                ),
        ),
        'mediawiki.action.history' => array(
+               'position' => 'top',
                'scripts' => 'resources/src/mediawiki.action/mediawiki.action.history.js',
                'styles' => 'resources/src/mediawiki.action/mediawiki.action.history.css',
-               'group' => 'mediawiki.action.history',
        ),
        'mediawiki.action.history.diff' => array(
                'position' => 'top',
@@ -1173,7 +1174,6 @@ return array(
                                'media' => 'print'
                        ),
                ),
-               'group' => 'mediawiki.action.history',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.action.view.dblClickEdit' => array(