From ac7d91f8342bf608bc96255b07eee993b2310f33 Mon Sep 17 00:00:00 2001 From: umherirrender Date: Fri, 24 Jan 2014 22:22:45 +0100 Subject: [PATCH] More use of Title::hasFragment Missing two places for the new method. Also change a remaining var access of Title::mFragment to accessor. Follow-Up: I27d9c3e40e6de6800f4488de167cf06e83c88ce6 Change-Id: I5d26b9a7662673b902e3f7147cbc95ca0626d721 --- includes/Linker.php | 7 +++---- includes/Title.php | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/includes/Linker.php b/includes/Linker.php index a47507185f..23bfd61cb0 100644 --- a/includes/Linker.php +++ b/includes/Linker.php @@ -278,9 +278,9 @@ class Linker { wfProfileIn( __METHOD__ ); # We don't want to include fragments for broken links, because they # generally make no sense. - if ( in_array( 'broken', $options ) && $target->mFragment !== '' ) { + if ( in_array( 'broken', $options ) && $target->hasFragment() ) { $target = clone $target; - $target->mFragment = ''; + $target->setFragment( '' ); } # If it's a broken link, add the appropriate query pieces, unless @@ -448,8 +448,7 @@ class Linker { if ( !$name ) { return $title; } - $ret = SpecialPage::getTitleFor( $name, $subpage ); - $ret->mFragment = $title->getFragment(); + $ret = SpecialPage::getTitleFor( $name, $subpage, $title->getFragment() ); return $ret; } else { return $title; diff --git a/includes/Title.php b/includes/Title.php index 79853dfe83..b1a8c1b0bf 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -1638,7 +1638,7 @@ class Title { wfProfileIn( __METHOD__ ); if ( $this->isExternal() || $proto !== PROTO_RELATIVE ) { $ret = $this->getFullURL( $query, $query2, $proto ); - } elseif ( $this->getPrefixedText() === '' && $this->getFragment() !== '' ) { + } elseif ( $this->getPrefixedText() === '' && $this->hasFragment() ) { $ret = $this->getFragmentForURL(); } else { $ret = $this->getLocalURL( $query, $query2 ) . $this->getFragmentForURL(); -- 2.20.1