jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/405600 )
Change subject: Don't call UserBoard::getUserBoardURL()
......................................................................
Don't call UserBoard::getUserBoardURL()
This is being removed in I913b5463813a23c8b4f5f697096a95af754e8518,
so let's not call this function anymore.
Change-Id: Icb27e324f430df3743d6302d077f050228d595c2
---
M includes/SiteScoutHTML.class.php
M includes/SiteScoutXML.class.php
2 files changed, 8 insertions(+), 2 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/SiteScoutHTML.class.php b/includes/SiteScoutHTML.class.php
index ff8ca89..53931e0 100644
--- a/includes/SiteScoutHTML.class.php
+++ b/includes/SiteScoutHTML.class.php
@@ -58,7 +58,10 @@
$commentIcon = $avatar->getAvatarURL();
$talk_page = htmlspecialchars(
$user_title->getTalkPage()->getFullURL(), ENT_QUOTES );
if ( $wgUserBoard ) {
- $talk_page =
UserBoard::getUserBoardURL( $item['username'] );
+ $talk_page = htmlspecialchars(
+ SpecialPage::getTitleFor(
'UserBoard' )->getFullURL( [ 'user' => $item['username'] ] ),
+ ENT_QUOTES
+ );
}
$output .= '<span class="item-user"><a href="'
. htmlspecialchars( $user_title->getFullURL(), ENT_QUOTES ) . '"
class="item-user-link">' . $commentIcon . ' ' . $item['username'] . '</a><a
href="' . $talk_page . '" class="item-user-talk"><img src="' .
$wgExtensionAssetsPath . '/SiteScout/resources/images/talkPageIcon.png" alt=""
/></a></span>';
$output .= '</div>';
diff --git a/includes/SiteScoutXML.class.php b/includes/SiteScoutXML.class.php
index e96d70f..0c4e8ec 100644
--- a/includes/SiteScoutXML.class.php
+++ b/includes/SiteScoutXML.class.php
@@ -18,7 +18,10 @@
$user_title = Title::makeTitle( NS_USER,
$item['username'] );
$talk_page = $user_title->getTalkPage()->getFullURL();
if ( $wgUserBoard ) {
- $talk_page = UserBoard::getUserBoardURL(
$item['username'] );
+ $talk_page = htmlspecialchars(
+ SpecialPage::getTitleFor( 'UserBoard'
)->getFullURL( [ 'user' => $item['username'] ] ),
+ ENT_QUOTES
+ );
}
$page_title = str_replace( '&', '%26',
$title->getPrefixedText() );
--
To view, visit https://gerrit.wikimedia.org/r/405600
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icb27e324f430df3743d6302d077f050228d595c2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/SiteScout
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
