jenkins-bot has submitted this change and it was merged.
Change subject: Fixed vega version parsing
......................................................................
Fixed vega version parsing
Now, by default the vega spec becomes
whatever the default version is
Change-Id: I952070cf05ab787c9324f3459cfebdbd0258c455
---
M includes/Graph.body.php
1 file changed, 4 insertions(+), 14 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Graph.body.php b/includes/Graph.body.php
index d8bef00..e80be12 100644
--- a/includes/Graph.body.php
+++ b/includes/Graph.body.php
@@ -161,22 +161,12 @@
// Figure out which vega version to use
global $wgGraphDefaultVegaVer;
- $useVega2 = false;
- if ( property_exists( $data, 'version' ) ) {
- $ver = is_numeric( $data->version ) ? $data->version :
0;
+ if ( property_exists( $data, 'version' ) && is_numeric(
$data->version ) ) {
+ $data->version = $data->version < 2 ? 1 : 2;
} else {
- $ver = false;
+ $data->version = $wgGraphDefaultVegaVer;
}
- if ( $wgGraphDefaultVegaVer > 1 || $isInteractive ) {
- if ( $ver === false ) {
- // If version is not set, but we need to force
vega2, insert it automatically
- $data->version = 2;
- }
- $useVega2 = true;
- } elseif ( $ver !== false ) {
- $useVega2 = $ver > 1;
- }
- if ( $useVega2 ) {
+ if ( $data->version === 2 ) {
$parserOutput->setExtensionData( 'graph_vega2', true );
} else {
$parserOutput->setExtensionData(
'graph_specs_obsolete', true );
--
To view, visit https://gerrit.wikimedia.org/r/265293
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I952070cf05ab787c9324f3459cfebdbd0258c455
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Graph
Gerrit-Branch: master
Gerrit-Owner: Yurik <yu...@wikimedia.org>
Gerrit-Reviewer: MaxSem <maxsem.w...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
