From f35c56e72aa15db9e61c605e8316c813bb5b83c4 Mon Sep 17 00:00:00 2001 From: Remember the dot Date: Tue, 21 Jul 2009 04:19:34 +0000 Subject: [PATCH] Follow-up to r52963: Moved ID attributes on header elements to the spans within the headers to avoid breaking things, at least until we can decide what the best way to handle these IDs is. --- RELEASE-NOTES | 5 +- includes/Linker.php | 4 +- maintenance/parserTests.txt | 122 ++++++++++++++++++------------------ 3 files changed, 66 insertions(+), 65 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index a015be42e2..13aa7a47de 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -138,8 +138,9 @@ this. Was used when mwEmbed was going to be an extension. task, to limit resource usage when the cache for a heavily-viewed article is invalidated. Requires an external daemon. * Leading > is now syntax for
. -* (bug 19576) Moved id attribues from anchors accompanying section headers to - the section headers themselves, removing the redundant anchor elements. +* (bug 19576) Moved the id attribues from the anchors accompanying section + headers to the elements within the section headers, + removing the redundant anchor elements. * Parser::setFunctionTagHook now can be used to add a new tag which is parsed at preprocesor level. * Added $wgShowArchiveThumbnails, allowing sysadmins to disable thumbnail diff --git a/includes/Linker.php b/includes/Linker.php index 3cdb545aa3..b88ec1a402 100644 --- a/includes/Linker.php +++ b/includes/Linker.php @@ -1362,9 +1362,9 @@ class Linker { * @return string HTML headline */ public function makeHeadline( $level, $attribs, $anchor, $text, $link, $legacyAnchor = false ) { - $ret = "$text" + . " $text" . ""; if ( $legacyAnchor !== false ) { $ret = "$ret"; diff --git a/maintenance/parserTests.txt b/maintenance/parserTests.txt index 099ee3d766..36ba75eae4 100644 --- a/maintenance/parserTests.txt +++ b/maintenance/parserTests.txt @@ -2683,8 +2683,8 @@ Bug 6563: Edit link generation for section shown by !! input {{includeonly section}} !! result -

[edit] Includeonly section

-

[edit] Section T-1

+

[edit] Includeonly section

+

[edit] Section T-1

!! end @@ -2710,7 +2710,7 @@ Bug 6563: Edit link generation for section suppressed by ==Section 1== !! result -

[edit] Section 1

+

[edit] Section 1

!! end @@ -3543,13 +3543,13 @@ More ===Smaller headline=== Blah blah !! result -

[edit] Headline 1

+

[edit] Headline 1

Some text

-

[edit] Headline 2

+

[edit] Headline 2

More

-

[edit] Smaller headline

+

[edit] Smaller headline

Blah blah

!! end @@ -3588,14 +3588,14 @@ Some text -

[edit] Headline 1

-

[edit] Subheadline 1

-
[edit] Skipping a level
-
[edit] Skipping a level
-

[edit] Headline 2

+

[edit] Headline 1

+

[edit] Subheadline 1

+
[edit] Skipping a level
+
[edit] Skipping a level
+

[edit] Headline 2

Some text

-

[edit] Another headline

+

[edit] Another headline

!! end @@ -3643,16 +3643,16 @@ Handling of sections up to level 6 and beyond -

[edit] Level 1 Heading

-

[edit] Level 2 Heading

-

[edit] Level 3 Heading

-

[edit] Level 4 Heading

-
[edit] Level 5 Heading
-
[edit] Level 6 Heading
-
[edit] = Level 7 Heading=
-
[edit] == Level 8 Heading==
-
[edit] === Level 9 Heading===
-
[edit] ==== Level 10 Heading====
+

[edit] Level 1 Heading

+

[edit] Level 2 Heading

+

[edit] Level 3 Heading

+

[edit] Level 4 Heading

+
[edit] Level 5 Heading
+
[edit] Level 6 Heading
+
[edit] = Level 7 Heading=
+
[edit] == Level 8 Heading==
+
[edit] === Level 9 Heading===
+
[edit] ==== Level 10 Heading====
!! end @@ -3685,12 +3685,12 @@ TOC regression (bug 9764) -

[edit] title 1

-

[edit] title 1.1

-

[edit] title 1.1.1

-

[edit] title 1.2

-

[edit] title 2

-

[edit] title 2.1

+

[edit] title 1

+

[edit] title 1.1

+

[edit] title 1.1.1

+

[edit] title 1.2

+

[edit] title 2

+

[edit] title 2.1

!! end @@ -3721,12 +3721,12 @@ wgMaxTocLevel=3 -

[edit] title 1

-

[edit] title 1.1

-

[edit] title 1.1.1

-

[edit] title 1.2

-

[edit] title 2

-

[edit] title 2.1

+

[edit] title 1

+

[edit] title 1.1

+

[edit] title 1.1.1

+

[edit] title 1.2

+

[edit] title 2

+

[edit] title 2.1

!! end @@ -3736,8 +3736,8 @@ Resolving duplicate section names == Foo bar == == Foo bar == !! result -

[edit] Foo bar

-

[edit] Foo bar

+

[edit] Foo bar

+

[edit] Foo bar

!! end @@ -3747,8 +3747,8 @@ Resolving duplicate section names with differing case (bug 10721) == Foo bar == == Foo Bar == !! result -

[edit] Foo bar

-

[edit] Foo Bar

+

[edit] Foo bar

+

[edit] Foo Bar

!! end @@ -3767,10 +3767,10 @@ __NOTOC__ {{sections}} ==Section 4== !! result -

[edit] Section 0

-

[edit] Section 1

-

[edit] Section 2

-

[edit] Section 4

+

[edit] Section 0

+

[edit] Section 1

+

[edit] Section 2

+

[edit] Section 4

!! end @@ -3781,8 +3781,8 @@ __NOEDITSECTION__ ==Section 1== ==Section 2== !! result -

Section 1

-

Section 2

+

Section 1

+

Section 2

!! end @@ -3791,7 +3791,7 @@ Link inside a section heading !! input ==Section with a [[Main Page|link]] in it== !! result - +

[edit] Section with a link in it

!! end @@ -3813,9 +3813,9 @@ __TOC__
  • 2 title 2
    • -

    [edit] title 1

    -

    [edit] title 1.1

    -

    [edit] title 2

    +

    [edit] title 1

    +

    [edit] title 1.1

    +

    [edit] title 2

    !! end @@ -4983,7 +4983,7 @@ Fuzz testing: Parser14 == onmouseover= == http://__TOC__ !! result -

    [edit] onmouseover=

    +

    [edit] onmouseover=

    http://

    Contents

    • 1 onmouseover=
      • @@ -4998,7 +4998,7 @@ Fuzz testing: Parser14-table ==a== {| STYLE=__TOC__ !! result -

      [edit] a

      +

      [edit] a

      @@ -6581,7 +6581,7 @@ Inclusion of !userCanEdit() content !! input {{MediaWiki:Fake}} !! result - +

      [edit] header

      !! end @@ -6612,12 +6612,12 @@ Out-of-order TOC heading levels
    -

    [edit] 2

    -
    [edit] 6
    -

    [edit] 3

    -

    [edit] 1

    -
    [edit] 5
    -

    [edit] 2

    +

    [edit] 2

    +
    [edit] 6
    +

    [edit] 3

    +

    [edit] 1

    +
    [edit] 5
    +

    [edit] 2

    !! end @@ -6854,7 +6854,7 @@ language=sr variant=sr-ec !! input == -{Naslov}- == !! result -

    [уреди] Naslov

    +

    [уреди] Naslov

    !! end @@ -6993,7 +6993,7 @@ Morwen/13: Unclosed link followed by heading !! result

    [[link

    -

    [edit] heading

    +

    [edit] heading

    !! end @@ -7005,7 +7005,7 @@ HHP2.1: Heuristics for headings in preprocessor parenthetical structures !! result

    {{foo|

    -

    heading

    +

    heading

    !! end @@ -7017,7 +7017,7 @@ HHP2.2: Heuristics for headings in preprocessor parenthetical structures !! result

    {{foo|

    -

    [edit] heading

    +

    [edit] heading

    !! end -- 2.20.1