Merge "mw.Feedback: Terms of use always appended and allows for link"

diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index 642fef8..efaaafa 100644 (file)
--- a/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@ -166,6 +166,8 @@ production.
   (instead of returning incorrect results) even when the page ID is known.
 * (T74070) Duplicate search for archived files on file upload now omits the extension.
   This requires the fa_sha1 field being populated.
+* Removed rel="archives" from the "View history" link, as it did not pass
+  HTML validation.
 
 === Action API changes in 1.25 ===
 * (T67403) XML tag highlighting is now only performed for formats

diff --git a/includes/page/Article.php b/includes/page/Article.php
index 817b4b6..cc87a10 100644 (file)
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -1634,7 +1634,7 @@ class Article implements Page {
                                $context->msg( 'historywarning' )->numParams( $revisions )->parse() .
                                $context->msg( 'word-separator' )->escaped() . Linker::linkKnown( $title,
                                        $context->msg( 'history' )->escaped(),
-                                       array( 'rel' => 'archives' ),
+                                       array(),
                                        array( 'action' => 'history' ) ) .
                                '</strong>'
                        );

diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php
index 98a1b03..b0390e9 100644 (file)
--- a/includes/skins/SkinTemplate.php
+++ b/includes/skins/SkinTemplate.php
@@ -948,7 +948,6 @@ class SkinTemplate extends Skin {
                                                'text' => wfMessageFallback( "$skname-view-history", 'history_short' )
                                                        ->setContext( $this->getContext() )->text(),
                                                'href' => $title->getLocalURL( 'action=history' ),
-                                               'rel' => 'archives',
                                        );
 
                                        if ( $title->quickUserCan( 'delete', $user ) ) {

diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 32c7a39..96f8210 100644 (file)
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -17850,7 +17850,7 @@ language=sr variant=sr-ec
 !! wikitext
 == -{Naslov}- ==
 !! html
-<h2><a href="#-.7BNaslov.7D-" class="mw-headline-anchor" aria-hidden="true" title="Ð\9bинк Ñ\82о Ñ\82Ñ\85иÑ\81 Ñ\81еÑ\86Ñ\82ион">§</a><span class="mw-headline" id="-.7BNaslov.7D-">Naslov</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Уредите одељак „Naslov“">уреди</a><span class="mw-editsection-bracket">]</span></span></h2>
+<h2><a href="#-.7BNaslov.7D-" class="mw-headline-anchor" aria-hidden="true" title="Ð\92еза до овог одеÑ\99ка">§</a><span class="mw-headline" id="-.7BNaslov.7D-">Naslov</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Уредите одељак „Naslov“">уреди</a><span class="mw-editsection-bracket">]</span></span></h2>
 
 !! end
 

diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
index 8a7470c..4a5705a 100644 (file)
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
@@ -692,7 +692,11 @@
                } );
        } );
 
-       QUnit.test( 'mw.loader erroneous indirect dependency', 3, function ( assert ) {
+       QUnit.test( 'mw.loader erroneous indirect dependency', 5, function ( assert ) {
+               // Keep "Error: expected" out of build log
+               var log = this.sandbox.stub( window.console || {}, 'log' ),
+                       error = this.sandbox.stub( window.console || {}, 'error' );
+
                mw.loader.register( [
                        ['test.module1', '0'],
                        ['test.module2', '0', ['test.module1']],
@@ -704,6 +708,9 @@
                assert.strictEqual( mw.loader.getState( 'test.module1' ), 'error', 'Expected "error" state for test.module1' );
                assert.strictEqual( mw.loader.getState( 'test.module2' ), 'error', 'Expected "error" state for test.module2' );
                assert.strictEqual( mw.loader.getState( 'test.module3' ), 'error', 'Expected "error" state for test.module3' );
+
+               assert.strictEqual( log.callCount, 1 );
+               assert.strictEqual( error.callCount, 1 );
        } );
 
        QUnit.test( 'mw.loader out-of-order implementation', 9, function ( assert ) {