jenkins-bot has submitted this change and it was merged.
Change subject: Use PROTO_CURRENT for paypal urls
......................................................................
Use PROTO_CURRENT for paypal urls
I was getting ones that start with // and the api pukes.
This is due to a weird vagrant override in settings.d
Either way, we should never send URLs that start with //
Bug: T131811
Change-Id: Ibee3d9b4605b77dfcabee12b42e80ca88588e698
---
M gateway_common/ResultPages.php
M globalcollect_gateway/globalcollect.adapter.php
M paypal_gateway/express_checkout/PaypalExpressReturnUrl.php
3 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/gateway_common/ResultPages.php b/gateway_common/ResultPages.php
index d7d02ba..8c743f5 100644
--- a/gateway_common/ResultPages.php
+++ b/gateway_common/ResultPages.php
@@ -136,7 +136,7 @@
return $url;
} else { // this isn't a url yet.
$returnTitle = Title::newFromText( $url );
- $url = $returnTitle->getFullURL();
+ $url = $returnTitle->getFullURL( false, false,
PROTO_CURRENT );
return $url;
}
}
diff --git a/globalcollect_gateway/globalcollect.adapter.php
b/globalcollect_gateway/globalcollect.adapter.php
index bbd83ef..75c5f0d 100644
--- a/globalcollect_gateway/globalcollect.adapter.php
+++ b/globalcollect_gateway/globalcollect.adapter.php
@@ -64,7 +64,7 @@
*/
function setGatewayDefaults( $options = array ( ) ) {
$returnTitle = isset( $options['returnTitle'] ) ?
$options['returnTitle'] : Title::newFromText(
'Special:GlobalCollectGatewayResult' );
- $returnTo = isset( $options['returnTo'] ) ?
$options['returnTo'] : $returnTitle->getFullURL();
+ $returnTo = isset( $options['returnTo'] ) ?
$options['returnTo'] : $returnTitle->getFullURL( false, false, PROTO_CURRENT );
$defaults = array (
'returnto' => $returnTo,
diff --git a/paypal_gateway/express_checkout/PaypalExpressReturnUrl.php
b/paypal_gateway/express_checkout/PaypalExpressReturnUrl.php
index 76b32b4..dbd1985 100644
--- a/paypal_gateway/express_checkout/PaypalExpressReturnUrl.php
+++ b/paypal_gateway/express_checkout/PaypalExpressReturnUrl.php
@@ -6,6 +6,6 @@
$staged['returnto'] = $returnTitle->getFullURL( array(
'order_id' => $normalized['order_id'],
'wmf_token' => $adapter->token_getSaltedSessionToken(),
- ) );
+ ), false, PROTO_CURRENT );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/289102
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibee3d9b4605b77dfcabee12b42e80ca88588e698
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Cdentinger <cdentin...@wikimedia.org>
Gerrit-Reviewer: AndyRussG <andrew.green...@gmail.com>
Gerrit-Reviewer: Cdentinger <cdentin...@wikimedia.org>
Gerrit-Reviewer: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: Ssmith <ssm...@wikimedia.org>
Gerrit-Reviewer: XenoRyet <dkozlow...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
