jenkins-bot has submitted this change and it was merged.
Change subject: (bug 45535) Hook for changing language links.
......................................................................
(bug 45535) Hook for changing language links.
This adds a new hook called LanguageLinks which is called
whenever a list of language links is returned to the user.
This gives extensions the option to manipulate the links
on the fly.
Note that this change only covers the language links used
in OutputPage and by ApiParse. Adapting ApiQueryLangLinks is
left as a follow-up task.
As explained on bugzilla, this is a precondition to
allowing Wikibase/Wikidata to update languagelinks without
forcing a (redundant) re-parse of the page content.
This change also introduces the notion of link flags that
can be used to associate flags with language links. This
will be integrated with ParserOutput and OutputPage in a
follow-up.
Change-Id: Iaec0faa131413a291fc8f77496e4f371addb3b99
---
M RELEASE-NOTES-1.22
M docs/hooks.txt
M includes/OutputPage.php
M includes/api/ApiParse.php
M includes/api/ApiQueryAllPages.php
M includes/api/ApiQueryLangBacklinks.php
M includes/api/ApiQueryLangLinks.php
7 files changed, 54 insertions(+), 4 deletions(-)
Approvals:
Anomie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22
index a9160e5..ce4c949 100644
--- a/RELEASE-NOTES-1.22
+++ b/RELEASE-NOTES-1.22
@@ -52,6 +52,8 @@
still be visible on cached page renders until they are purged); extensions
using the DoEditSectionLink or EditSectionLink hooks might need adjustments
as
well.
+* (bug 45535) introduced the new 'LanguageLinks' hook for manipulating the
+ language links associated with a page before display.
=== Bug fixes in 1.22 ===
* Disable Special:PasswordReset when $wgEnableEmail. Previously one could still
@@ -84,6 +86,13 @@
* action=opensearch no longer silently ignores the format parameter.
* action=opensearch now supports format=jsonfm.
* list=usercontribs&ucprop=ids will now include the parent revision id.
+* BREAKING CHANGE: action=parse no longer returns all langlinks for the page
+ with prop=langlinks by default. The new effectivelanglinks parameter will
+ request that the LanguageLinks hook be called to determine the effective
+ language links.
+* BREAKING CHANGE: list=allpages, list=langbacklinks, and prop=langlinks do not
+ apply the new LanguageLinks hook, and thus only consider language links
+ stored in the database.
=== Languages updated in 1.22===
diff --git a/docs/hooks.txt b/docs/hooks.txt
index 2d64bce..de51024 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1384,6 +1384,16 @@
&$names: array of language code => language name
$code language of the preferred translations
+'LanguageLinks': Manipulate a page's language links. This is called
+in various places to allow extensions to define the effective language
+links for a page.
+$title: The page's Title.
+&$links: Associative array mapping language codes to prefixed links of the
+ form "language:title".
+&$linkFlags: Associative array mapping prefixed links to arrays of flags.
+ Currently unused, but planned to provide support for marking individual
+ language links in the UI, e.g. for featured articles.
+
'LinkBegin': Used when generating internal and interwiki links in
Linker::link(), before processing starts. Return false to skip default
processing and return $ret. See documentation for Linker::link() for details on
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 08eb3ae..65800dd 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1609,6 +1609,10 @@
}
}
+ // Link flags are ignored for now, but may in the future be
+ // used to mark individual language links.
+ $linkFlags = array();
+ wfRunHooks( 'LanguageLinks', array( $this->getTitle(),
&$this->mLanguageLinks, &$linkFlags ) );
wfRunHooks( 'OutputPageParserOutput', array( &$this,
$parserOutput ) );
}
diff --git a/includes/api/ApiParse.php b/includes/api/ApiParse.php
index 09b7a88..defdade 100644
--- a/includes/api/ApiParse.php
+++ b/includes/api/ApiParse.php
@@ -233,11 +233,25 @@
$result->setContent( $result_array['parsedsummary'],
Linker::formatComment( $params['summary'], $titleObj ) );
}
+ if ( isset( $prop['langlinks'] ) || isset(
$prop['languageshtml'] ) ) {
+ $langlinks = $p_result->getLanguageLinks();
+
+ if ( $params['effectivelanglinks'] ) {
+ // Link flags are ignored for now, but may in
the future be
+ // included in the result.
+ $linkFlags = array();
+ wfRunHooks( 'LanguageLinks', array( $titleObj,
&$langlinks, &$linkFlags ) );
+ }
+ } else {
+ $langlinks = false;
+ }
+
if ( isset( $prop['langlinks'] ) ) {
- $result_array['langlinks'] = $this->formatLangLinks(
$p_result->getLanguageLinks() );
+ $result_array['langlinks'] = $this->formatLangLinks(
$langlinks );
}
if ( isset( $prop['languageshtml'] ) ) {
- $languagesHtml = $this->languagesHtml(
$p_result->getLanguageLinks() );
+ $languagesHtml = $this->languagesHtml( $langlinks );
+
$result_array['languageshtml'] = array();
$result->setContent( $result_array['languageshtml'],
$languagesHtml );
}
@@ -575,6 +589,7 @@
),
'pst' => false,
'onlypst' => false,
+ 'effectivelanglinks' => false,
'uselang' => null,
'section' => null,
'disablepp' => false,
@@ -618,6 +633,10 @@
' wikitext - Gives the original wikitext
that was parsed',
' properties - Gives various properties
defined in the parsed wikitext',
),
+ 'effectivelanglinks' => array(
+ 'Includes language links supplied by
extensions',
+ '(for use with prop=langlinks|languageshtml)',
+ ),
'pst' => array(
'Do a pre-save transform on the input before
parsing it',
'Ignored if page, pageid or oldid is used'
diff --git a/includes/api/ApiQueryAllPages.php
b/includes/api/ApiQueryAllPages.php
index 0d0c10f..d95980c 100644
--- a/includes/api/ApiQueryAllPages.php
+++ b/includes/api/ApiQueryAllPages.php
@@ -304,7 +304,10 @@
'prtype' => 'Limit to protected pages only',
'prlevel' => "The protection level (must be used with
{$p}prtype= parameter)",
'prfiltercascade' => "Filter protections based on
cascadingness (ignored when {$p}prtype isn't set)",
- 'filterlanglinks' => 'Filter based on whether a page
has langlinks',
+ 'filterlanglinks' => array(
+ 'Filter based on whether a page has langlinks',
+ 'Note that this may not consider langlinks
added by extensions.',
+ ),
'limit' => 'How many total pages to return.',
'prexpiry' => array(
'Which protection expiry to filter the page on',
diff --git a/includes/api/ApiQueryLangBacklinks.php
b/includes/api/ApiQueryLangBacklinks.php
index 7a4880a..ce03e58 100644
--- a/includes/api/ApiQueryLangBacklinks.php
+++ b/includes/api/ApiQueryLangBacklinks.php
@@ -223,7 +223,8 @@
return array( 'Find all pages that link to the given language
link.',
'Can be used to find all links with a language code,
or',
'all links to a title (with a given language).',
- 'Using neither parameter is effectively "All Language
Links"',
+ 'Using neither parameter is effectively "All Language
Links".',
+ 'Note that this may not consider language links added
by extensions.',
);
}
diff --git a/includes/api/ApiQueryLangLinks.php
b/includes/api/ApiQueryLangLinks.php
index e6b02d7..aa796e3 100644
--- a/includes/api/ApiQueryLangLinks.php
+++ b/includes/api/ApiQueryLangLinks.php
@@ -67,6 +67,10 @@
);
}
+ //FIXME: (follow-up) To allow extensions to add to the language
links, we need
+ // to load them all, add the extra links, then apply
paging.
+ // Should not be terrible, it's not going to be more than
a few hundred links.
+
// Note that, since (ll_from, ll_lang) is a unique key, we
don't need
// to sort by ll_title to ensure deterministic ordering.
$sort = ( $params['dir'] == 'descending' ? ' DESC' : '' );
--
To view, visit https://gerrit.wikimedia.org/r/59997
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaec0faa131413a291fc8f77496e4f371addb3b99
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler <daniel.kinz...@wikimedia.de>
Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Anomie <bjor...@wikimedia.org>
Gerrit-Reviewer: Daniel Friesen <dan...@nadir-seen-fire.com>
Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de>
Gerrit-Reviewer: Demon <ch...@wikimedia.org>
Gerrit-Reviewer: Tim Starling <tstarl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
