Yaron Koren has submitted this change and it was merged.
Change subject: Revert of change e3135e2 (contained a PHP error)
......................................................................
Revert of change e3135e2 (contained a PHP error)
Change-Id: I5d503d16b1cc8d532fe9c2ae0fc2b418cccde96c
---
M CargoQueryDisplayer.php
M parserfunctions/CargoQuery.php
2 files changed, 4 insertions(+), 10 deletions(-)
Approvals:
Yaron Koren: Verified; Looks good to me, approved
diff --git a/CargoQueryDisplayer.php b/CargoQueryDisplayer.php
index a8937e7..90e537a 100644
--- a/CargoQueryDisplayer.php
+++ b/CargoQueryDisplayer.php
@@ -227,7 +227,7 @@
/**
* Display the link to view more results, pointing to Special:ViewData.
*/
- public function viewMoreResultsLink( $displayHTML = true,
$moreResultsTextStr = wfMessage( 'moredotdotdot' )->parse() ) {
+ public function viewMoreResultsLink( $displayHTML = true ) {
$vd = Title::makeTitleSafe( NS_SPECIAL, 'ViewData' );
$queryStringParams = array();
$sqlQuery = $this->mSQLQuery;
@@ -258,11 +258,11 @@
if ( $displayHTML ) {
return Html::rawElement( 'p', null,
- Linker::link( $vd, $moreResultsTextStr,
array(), $queryStringParams ) );
+ Linker::link( $vd, wfMessage( 'moredotdotdot'
)->parse(), array(), $queryStringParams ) );
} else {
// Display link as wikitext.
global $wgServer;
- return '[' . $wgServer . $vd->getLinkURL(
$queryStringParams ) . ' ' . $moreResultsTextStr . ']';
+ return '[' . $wgServer . $vd->getLinkURL(
$queryStringParams ) . ' ' . wfMessage( 'moredotdotdot' )->parse() . ']';
}
}
diff --git a/parserfunctions/CargoQuery.php b/parserfunctions/CargoQuery.php
index 02b1b68..c0fc987 100644
--- a/parserfunctions/CargoQuery.php
+++ b/parserfunctions/CargoQuery.php
@@ -54,8 +54,6 @@
$limitStr = $value;
} elseif ( $key == 'format' ) {
$format = $value;
- } elseif ( $key == 'more results text' ) {
- $moreResultsTextStr = $value;
} else {
// We'll assume it's going to the formatter.
$displayParams[$key] = $value;
@@ -122,11 +120,7 @@
// If there are (seemingly) more results than what we showed,
// show a "View more" link that links to Special:ViewData.
if ( count( $queryResults ) == $sqlQuery->mQueryLimit ) {
- if ( $moreResultsTextStr != null ) {
- $text .= $queryDisplayer->viewMoreResultsLink(
$displayHTML, $moreResultsTextStr );
- } else {
- $text .= $queryDisplayer->viewMoreResultsLink(
$displayHTML );
- }
+ $text .= $queryDisplayer->viewMoreResultsLink(
$displayHTML );
}
if ( $displayHTML ) {
--
To view, visit https://gerrit.wikimedia.org/r/194496
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5d503d16b1cc8d532fe9c2ae0fc2b418cccde96c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren <[email protected]>
Gerrit-Reviewer: Yaron Koren <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
