Merge "Linker: Don't use Title::setFragment()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 13 Sep 2017 10:07:16 +0000 (10:07 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 13 Sep 2017 10:07:16 +0000 (10:07 +0000)
1  2 
includes/Linker.php

diff --combined includes/Linker.php
@@@ -1291,9 -1291,7 +1291,7 @@@ class Linker 
                                                        if ( $target->getText() == '' && !$target->isExternal()
                                                                && !$local && $title
                                                        ) {
-                                                               $newTarget = clone $title;
-                                                               $newTarget->setFragment( '#' . $target->getFragment() );
-                                                               $target = $newTarget;
+                                                               $target = $title->createFragmentTarget( $target->getFragment() );
                                                        }
  
                                                        $thelink = Linker::makeCommentLink( $target, $linkText . $inside, $wikiId ) . $trail;
                if ( $sectionIndex !== false ) {
                        $classes .= " tocsection-$sectionIndex";
                }
 -              return "\n<li class=\"$classes\"><a href=\"#" .
 -                      $anchor . '"><span class="tocnumber">' .
 -                      $tocnumber . '</span> <span class="toctext">' .
 -                      $tocline . '</span></a>';
 +
 +              // \n<li class="$classes"><a href="#$anchor"><span class="tocnumber">
 +              // $tocnumber</span> <span class="toctext">$tocline</span></a>
 +              return "\n" . Html::openElement( 'li', [ 'class' => $classes ] )
 +                      . Html::rawElement( 'a',
 +                              [ 'href' => "#$anchor" ],
 +                              Html::element( 'span', [ 'class' => 'tocnumber' ], $tocnumber )
 +                                      . ' '
 +                                      . Html::rawElement( 'span', [ 'class' => 'toctext' ], $tocline )
 +                      );
        }
  
        /**