Bartosz Dziewoński has submitted this change and it was merged.
Change subject: Replace usage of SpecialPage::getTitle with getPageTitle
......................................................................
Replace usage of SpecialPage::getTitle with getPageTitle
Was deprecated in 1.23, see Icdcf5d5295ef5e7f08b1d403e0c123f78738fd40
Change-Id: I1780cdfeea024ff5c66c784b95db9522f2d3a9e8
---
M SystemGifts/SpecialSystemGiftManager.php
M SystemGifts/SpecialViewSystemGifts.php
M SystemGifts/TopAwards.php
M UserActivity/UserActivity.body.php
M UserBoard/SpecialUserBoard.php
M UserGifts/SpecialGiftManager.php
M UserGifts/SpecialGiveGift.php
M UserGifts/SpecialViewGifts.php
M UserProfile/SpecialEditProfile.php
M UserProfile/SpecialRemoveAvatar.php
M UserProfile/SpecialUploadAvatar.php
M UserRelationship/SpecialViewRelationships.php
M UserStats/TopFansByStat.php
13 files changed, 23 insertions(+), 23 deletions(-)
Approvals:
Bartosz Dziewoński: Verified; Looks good to me, approved
diff --git a/SystemGifts/SpecialSystemGiftManager.php
b/SystemGifts/SpecialSystemGiftManager.php
index f3b26a6..7abad47 100644
--- a/SystemGifts/SpecialSystemGiftManager.php
+++ b/SystemGifts/SpecialSystemGiftManager.php
@@ -89,7 +89,7 @@
} else {
$out->addHTML(
'<div><b><a href="' .
- $this->getTitle()->escapeFullURL(
'method=edit' ) . '">' .
+ $this->getPageTitle()->escapeFullURL(
'method=edit' ) . '">' .
$this->msg( 'ga-addnew'
)->plain() . '</a></b></div>'
);
$out->addHTML( $this->displayGiftList() );
@@ -122,7 +122,7 @@
}
$output .= '<div class="Item">
- <a href="' .
$this->getTitle()->escapeFullURL( 'id=' . $gift['id'] ) . '">' .
+ <a href="' .
$this->getPageTitle()->escapeFullURL( 'id=' . $gift['id'] ) . '">' .
$gift['gift_name'] . '</a> ' .
$deleteLink . '</div>' . "\n";
}
@@ -134,7 +134,7 @@
function displayForm( $gift_id ) {
global $wgUploadPath;
- $form = '<div><b><a href="' .
$this->getTitle()->escapeFullURL() .
+ $form = '<div><b><a href="' .
$this->getPageTitle()->escapeFullURL() .
'">' . $this->msg( 'ga-viewlist' )->plain() .
'</a></b></div>';
if ( $gift_id ) {
diff --git a/SystemGifts/SpecialViewSystemGifts.php
b/SystemGifts/SpecialViewSystemGifts.php
index d06cbc0..ef5ed0e 100644
--- a/SystemGifts/SpecialViewSystemGifts.php
+++ b/SystemGifts/SpecialViewSystemGifts.php
@@ -132,7 +132,7 @@
*/
$numofpages = $total / $per_page;
- $page_link = $this->getTitle();
+ $page_link = $this->getPageTitle();
if ( $numofpages > 1 ) {
$output .= '<div class="page-nav">';
diff --git a/SystemGifts/TopAwards.php b/SystemGifts/TopAwards.php
index 741b719..a6cada2 100644
--- a/SystemGifts/TopAwards.php
+++ b/SystemGifts/TopAwards.php
@@ -141,7 +141,7 @@
if ( $nav_x == $category_number ) {
$output .= "<p><b>{$msg}</b></p>";
} else {
- $output .= '<p><a href="' .
$this->getTitle()->escapeFullURL(
+ $output .= '<p><a href="' .
$this->getPageTitle()->escapeFullURL(
"category={$nav_x}" ) .
"\">{$msg}</a></p>";
}
$nav_x++;
diff --git a/UserActivity/UserActivity.body.php
b/UserActivity/UserActivity.body.php
index fdf3b82..8664eaf 100644
--- a/UserActivity/UserActivity.body.php
+++ b/UserActivity/UserActivity.body.php
@@ -111,14 +111,14 @@
}
$link_image = $line[2];
- $output .= '<a href="' .
$this->getTitle()->escapeFullURL( "item_type={$filter}" ) .
+ $output .= '<a href="' .
$this->getPageTitle()->escapeFullURL( "item_type={$filter}" ) .
"\"><img
src=\"{$wgExtensionAssetsPath}/SocialProfile/images/" .
UserActivity::getTypeIcon(
$link_image ) . "\"/>{$link_text}</a>";
}
}
$output .= Linker::link(
- $this->getTitle(),
+ $this->getPageTitle(),
$this->msg( 'useractivity-all' )->plain()
);
$output .= '</div>
diff --git a/UserBoard/SpecialUserBoard.php b/UserBoard/SpecialUserBoard.php
index bf2ee2a..f1972a5 100644
--- a/UserBoard/SpecialUserBoard.php
+++ b/UserBoard/SpecialUserBoard.php
@@ -158,7 +158,7 @@
$output .= '<div class="page-nav">';
if ( $page > 1 ) {
$output .= Linker::link(
- $this->getTitle(),
+ $this->getPageTitle(),
$this->msg( 'userboard_prevpage'
)->plain(),
array(),
array(
@@ -183,7 +183,7 @@
$output .= ( $i . ' ' );
} else {
$output .= Linker::link(
- $this->getTitle(),
+ $this->getPageTitle(),
$i,
array(),
array(
@@ -197,7 +197,7 @@
if ( ( $total - ( $per_page * $page ) ) > 0 ) {
$output .= $this->msg( 'word-separator'
)->plain() .
Linker::link(
- $this->getTitle(),
+ $this->getPageTitle(),
$this->msg( 'userboard_nextpage'
)->plain(),
array(),
array(
diff --git a/UserGifts/SpecialGiftManager.php b/UserGifts/SpecialGiftManager.php
index 27e6d94..083d5e5 100644
--- a/UserGifts/SpecialGiftManager.php
+++ b/UserGifts/SpecialGiftManager.php
@@ -78,7 +78,7 @@
if ( $this->canUserCreateGift() ) {
$out->addHTML(
'<div><b><a href="' .
-
$this->getTitle()->escapeFullURL( 'method=edit' ) .
+
$this->getPageTitle()->escapeFullURL( 'method=edit' ) .
'">' . $this->msg(
'giftmanager-addgift' )->plain() .
'</a></b></div>'
);
@@ -193,7 +193,7 @@
}
$output .= '<div class="Item">
- <a href="' . $this->getTitle()->escapeFullURL(
"id={$gift['id']}" ) . '">' .
+ <a href="' .
$this->getPageTitle()->escapeFullURL( "id={$gift['id']}" ) . '">' .
$gift['gift_name'] . '</a> ' .
$deleteLink . "</div>\n";
}
@@ -208,7 +208,7 @@
return $this->displayGiftList();
}
- $form = '<div><b><a href="' .
$this->getTitle()->escapeFullURL() .
+ $form = '<div><b><a href="' .
$this->getPageTitle()->escapeFullURL() .
'">' . $this->msg( 'giftmanager-view' )->plain() .
'</a></b></div>';
if ( $gift_id ) {
diff --git a/UserGifts/SpecialGiveGift.php b/UserGifts/SpecialGiveGift.php
index d42c0d3..b240104 100644
--- a/UserGifts/SpecialGiveGift.php
+++ b/UserGifts/SpecialGiveGift.php
@@ -229,7 +229,7 @@
$this->getOutput()->setPageTitle( $this->msg(
'g-give-no-user-title' )->plain() );
$output = '<form action="" method="get"
enctype="multipart/form-data" name="gift">' .
- Html::hidden( 'title', $this->getTitle() ) .
+ Html::hidden( 'title', $this->getPageTitle() ) .
'<div class="g-message">' .
$this->msg( 'g-give-no-user-message' )->plain()
.
'</div>
@@ -335,7 +335,7 @@
/**
* Build next/prev nav
*/
- $giveGiftLink = $this->getTitle();
+ $giveGiftLink = $this->getPageTitle();
$numofpages = $total / $per_page;
$user_name = $user->getText();
diff --git a/UserGifts/SpecialViewGifts.php b/UserGifts/SpecialViewGifts.php
index 5e73fce..769207f 100644
--- a/UserGifts/SpecialViewGifts.php
+++ b/UserGifts/SpecialViewGifts.php
@@ -163,7 +163,7 @@
*/
$numofpages = $total / $per_page;
- $pageLink = $this->getTitle();
+ $pageLink = $this->getPageTitle();
if ( $numofpages > 1 ) {
$output .= '<div class="page-nav">';
diff --git a/UserProfile/SpecialEditProfile.php
b/UserProfile/SpecialEditProfile.php
index feaf4f0..43a8ba4 100644
--- a/UserProfile/SpecialEditProfile.php
+++ b/UserProfile/SpecialEditProfile.php
@@ -124,7 +124,7 @@
}
function createUserInputForm() {
- $actionUrl = $this->getTitle()->getLocalURL( '' );
+ $actionUrl = $this->getPageTitle()->getLocalURL( '' );
$form = Xml::openElement( 'fieldset' ) .
Xml::openElement( 'form',
array(
diff --git a/UserProfile/SpecialRemoveAvatar.php
b/UserProfile/SpecialRemoveAvatar.php
index 6c6e42c..02c5dcc 100644
--- a/UserProfile/SpecialRemoveAvatar.php
+++ b/UserProfile/SpecialRemoveAvatar.php
@@ -53,7 +53,7 @@
$out->setPageTitle( $this->msg( 'avatarupload-removeavatar'
)->plain() );
if ( $request->getVal( 'user' ) != '' ) {
- $out->redirect( $this->getTitle()->getFullURL() . '/' .
$request->getVal( 'user' ) );
+ $out->redirect( $this->getPageTitle()->getFullURL() .
'/' . $request->getVal( 'user' ) );
}
// If the request was POSTed, then delete the avatar
@@ -82,7 +82,7 @@
'</div>'
);
$out->addHTML(
- '<div><a href="' .
$this->getTitle()->escapeFullURL() . '">' .
+ '<div><a href="' .
$this->getPageTitle()->escapeFullURL() . '">' .
$this->msg(
'avatarupload-removeanother' )->plain() .
'</a></div>'
);
@@ -101,7 +101,7 @@
*/
private function showUserForm() {
$output = '<form method="get" name="avatar" action="">' .
- Html::hidden( 'title', $this->getTitle() ) .
+ Html::hidden( 'title', $this->getPageTitle() ) .
'<b>' . $this->msg( 'username' )->plain() .
'</b>
<input type="text" name="user" />
<input type="submit" value="' . $this->msg(
'search' )->plain() . '" />
diff --git a/UserProfile/SpecialUploadAvatar.php
b/UserProfile/SpecialUploadAvatar.php
index 6198574..cde9870 100644
--- a/UserProfile/SpecialUploadAvatar.php
+++ b/UserProfile/SpecialUploadAvatar.php
@@ -194,7 +194,7 @@
// hurt either
// @see https://bugzilla.wikimedia.org/show_bug.cgi?id=30953
$output .= Html::hidden( 'wpEditToken',
$this->getUser()->getEditToken(), array( 'id' => 'wpEditToken' ) ) . "\n";
- $output .= Html::hidden( 'title',
$this->getTitle()->getPrefixedText() ) . "\n";
+ $output .= Html::hidden( 'title',
$this->getPageTitle()->getPrefixedText() ) . "\n";
$output .= '<table border="0">
<tr>
<td>
diff --git a/UserRelationship/SpecialViewRelationships.php
b/UserRelationship/SpecialViewRelationships.php
index cd45dcf..139aad3 100644
--- a/UserRelationship/SpecialViewRelationships.php
+++ b/UserRelationship/SpecialViewRelationships.php
@@ -231,7 +231,7 @@
$total = intval( str_replace( ',', '', $total ) );
$numofpages = $total / $per_page;
- $pageLink = $this->getTitle();
+ $pageLink = $this->getPageTitle();
if ( $numofpages > 1 ) {
$output .= '<div class="page-nav">';
diff --git a/UserStats/TopFansByStat.php b/UserStats/TopFansByStat.php
index e5e92af..3876d8c 100644
--- a/UserStats/TopFansByStat.php
+++ b/UserStats/TopFansByStat.php
@@ -131,7 +131,7 @@
$output .= '<p>';
$output .= Linker::link(
- $this->getTitle(),
+ $this->getPageTitle(),
$link_text,
array(),
array( 'stat' => $stat )
--
To view, visit https://gerrit.wikimedia.org/r/103991
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1780cdfeea024ff5c66c784b95db9522f2d3a9e8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
