Yaron Koren has submitted this change and it was merged.
Change subject: Fixed newFromPage() to work again for both page names and Title
objects
......................................................................
Fixed newFromPage() to work again for both page names and Title objects
Change-Id: Ibd0798f8f91ccf07d62376927481d0f8cbf917ca
---
M AdminLinks_body.php
1 file changed, 7 insertions(+), 5 deletions(-)
Approvals:
Yaron Koren: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/AdminLinks_body.php b/AdminLinks_body.php
index dfa976f..f24c9df 100644
--- a/AdminLinks_body.php
+++ b/AdminLinks_body.php
@@ -254,13 +254,15 @@
var $text;
var $label;
- static function newFromPage( $page_name, $desc = null, $query = array()
) {
+ static function newFromPage( $page_name_or_title, $desc = null, $query
= array() ) {
$item = new ALItem();
$item->label = $desc;
- if ( count( $query ) ) {
- $item->text = Linker::linkKnown( $page_name, $desc,
array(), $query );
- } else
- $item->text = "[[$page_name|$desc]]";
+ if ( $page_name_or_title instanceof Title ) {
+ $title = $page_name_or_title;
+ } else {
+ $title = Title::newFromText( $page_name_or_title );
+ }
+ $item->text = Linker::linkKnown( $title, $desc, array(), $query
);
return $item;
}
--
To view, visit https://gerrit.wikimedia.org/r/61771
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd0798f8f91ccf07d62376927481d0f8cbf917ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AdminLinks
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren <yaro...@gmail.com>
Gerrit-Reviewer: Yaron Koren <yaro...@gmail.com>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
