[MediaWiki-commits] [Gerrit] Special parsing should not be called for Special:RunQuery - change (mediawiki...Cargo)

2016-06-10 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Special parsing should not be called for Special:RunQuery
..


Special parsing should not be called for Special:RunQuery

Change-Id: Ie3b780b9b74c594c4e6cbf790b68da4e0a2abff3
---
M CargoUtils.php
1 file changed, 4 insertions(+), 1 deletion(-)

Approvals:
  Yaron Koren: Checked; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/CargoUtils.php b/CargoUtils.php
index 4f80014..8b6428e 100644
--- a/CargoUtils.php
+++ b/CargoUtils.php
@@ -339,7 +339,10 @@
// Special:RunJobs.
// If that's the case, do nothing - we don't need to
// parse the value.
-   } elseif ( ( $title != null && $title->isSpecialPage() ) ||
+   // This next clause should only be called for Cargo's special
+   // pages, not for SF's Special:RunQuery. Don't know about other
+   // special pages.
+   } elseif ( ( $title != null && $title->isSpecialPage() && 
!$wgRequest->getCheck( 'wpRunQuery' ) ) ||
// The 'pagevalues' action is also a Cargo special page.
$wgRequest->getVal( 'action' ) == 'pagevalues' ) {
$parserOutput = $parser->parse( $value, $title, new 
ParserOptions(), false );

-- 
To view, visit https://gerrit.wikimedia.org/r/293768
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3b780b9b74c594c4e6cbf790b68da4e0a2abff3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Special parsing should not be called for Special:RunQuery - change (mediawiki...Cargo)

2016-06-10 Thread Yaron Koren (Code Review) 
Yaron Koren has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/293768

Change subject: Special parsing should not be called for Special:RunQuery
..

Special parsing should not be called for Special:RunQuery

Change-Id: Ie3b780b9b74c594c4e6cbf790b68da4e0a2abff3
---
M CargoUtils.php
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo 
refs/changes/68/293768/1

diff --git a/CargoUtils.php b/CargoUtils.php
index 4f80014..8b6428e 100644
--- a/CargoUtils.php
+++ b/CargoUtils.php
@@ -339,7 +339,10 @@
// Special:RunJobs.
// If that's the case, do nothing - we don't need to
// parse the value.
-   } elseif ( ( $title != null && $title->isSpecialPage() ) ||
+   // This next clause should only be called for Cargo's special
+   // pages, not for SF's Special:RunQuery. Don't know about other
+   // special pages.
+   } elseif ( ( $title != null && $title->isSpecialPage() && 
!$wgRequest->getCheck( 'wpRunQuery' ) ) ||
// The 'pagevalues' action is also a Cargo special page.
$wgRequest->getVal( 'action' ) == 'pagevalues' ) {
$parserOutput = $parser->parse( $value, $title, new 
ParserOptions(), false );

-- 
To view, visit https://gerrit.wikimedia.org/r/293768
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3b780b9b74c594c4e6cbf790b68da4e0a2abff3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits