Yaron Koren has submitted this change and it was merged.
Change subject: Changes so that #cargo_query will pass the parser to the format
......................................................................
Changes so that #cargo_query will pass the parser to the format
This doesn't seem to change any behavior.
Change-Id: I02a916350651dcd36d17dd07a02e5c7971ed5eb3
---
M CargoQueryDisplayer.php
M parserfunctions/CargoQuery.php
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Yaron Koren: Verified; Looks good to me, approved
diff --git a/CargoQueryDisplayer.php b/CargoQueryDisplayer.php
index 990bc93..b25efbc 100644
--- a/CargoQueryDisplayer.php
+++ b/CargoQueryDisplayer.php
@@ -67,9 +67,9 @@
return $formatClasses[$format];
}
- public function getFormatter( $out ) {
+ public function getFormatter( $out, $parser = null ) {
$formatClass = $this->getFormatClass();
- $formatObject = new $formatClass( $out );
+ $formatObject = new $formatClass( $out, $parser );
return $formatObject;
}
diff --git a/parserfunctions/CargoQuery.php b/parserfunctions/CargoQuery.php
index dab955f..44d5fed 100644
--- a/parserfunctions/CargoQuery.php
+++ b/parserfunctions/CargoQuery.php
@@ -65,7 +65,7 @@
$queryDisplayer->mFormat = $format;
$queryDisplayer->mDisplayParams = $displayParams;
$queryDisplayer->mParser = $parser;
- $formatter = $queryDisplayer->getFormatter(
$parser->getOutput() );
+ $formatter = $queryDisplayer->getFormatter(
$parser->getOutput(), $parser );
// Let the format run the query itself, if it wants to.
if ( $formatter->isDeferred() ) {
--
To view, visit https://gerrit.wikimedia.org/r/189961
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I02a916350651dcd36d17dd07a02e5c7971ed5eb3
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
