Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/109426
Change subject: More use of Title::hasFragment
......................................................................
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
---
M includes/Linker.php
M includes/Title.php
2 files changed, 4 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/26/109426/1
diff --git a/includes/Linker.php b/includes/Linker.php
index a475071..23bfd61 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -278,9 +278,9 @@
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 @@
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 79853df..b1a8c1b 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1638,7 +1638,7 @@
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();
--
To view, visit https://gerrit.wikimedia.org/r/109426
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d26b9a7662673b902e3f7147cbc95ca0626d721
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <umherirrender_de...@web.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
