jenkins-bot has submitted this change and it was merged.
Change subject: Replaced fix with authorized (and much simpler) solution
......................................................................
Replaced fix with authorized (and much simpler) solution
Change-Id: I25491c923960ffaf799f7b6e15429e1ea3a52658
---
M SemanticForms.php
M specials/SF_RunQuery.php
2 files changed, 3 insertions(+), 9 deletions(-)
Approvals:
Yaron Koren: Checked; Looks good to me, approved
jenkins-bot: Verified
diff --git a/SemanticForms.php b/SemanticForms.php
index 1fcb67b..262de70 100644
--- a/SemanticForms.php
+++ b/SemanticForms.php
@@ -449,3 +449,6 @@
$sfgAutocompleteValues = array();
$sfgFieldProperties = array();
$sfgDependentFields = array();
+
+// Necessary setting for SMW 1.9+
+$smwgEnabledSpecialPage[] = 'RunQuery';
diff --git a/specials/SF_RunQuery.php b/specials/SF_RunQuery.php
index 2c0492f..0dd86c0 100644
--- a/specials/SF_RunQuery.php
+++ b/specials/SF_RunQuery.php
@@ -97,15 +97,6 @@
$wgParser->mOptions = ParserOptions::newFromUser(
$wgUser );
$resultsText = $wgParser->parse( $data_text, $wgTitle,
$wgParser->mOptions )->getText();
-
- // Possibly a hack - for SMW 1.9+, if the "query
- // results" for this page contain a result format that
- // includes Javascript, the JS libraries required
- // don't necessarily get included on the page. This
- // call adds in whatever hasn't yet been added.
- if ( method_exists( 'SMWOutputs',
'commitToParserOutput' ) ) {
- SMWOutputs::commitToParserOutput(
$wgParser->getOutput() );
- }
}
// Get the full text of the form.
--
To view, visit https://gerrit.wikimedia.org/r/111820
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I25491c923960ffaf799f7b6e15429e1ea3a52658
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren <[email protected]>
Gerrit-Reviewer: Yaron Koren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
